March 2021 - tor-commits - lists.torproject.org

[community/staging] better strings for l10n
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 176c87e00c097a951d65d60a29c43c9b7e28fb38 Author: emma peel <emma.peel(a)riseup.net> Date: Sun Aug 25 16:39:09 2019 +0200 better strings for l10n --- .../bridge/debian-ubuntu/contents.lr | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index cf83c8d..e68a4da 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -12,11 +12,12 @@ Get the latest version of Tor. If you're on Debian stable, `sudo apt-get install ### 2. Install obfs4proxy -On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the `obfs4proxy` package is available in unstable, testing, and stable. On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, and eoan have the package. If you're running any of them, `sudo apt-get install obfs4proxy` should work. +On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the `obfs4proxy` package is available in unstable, testing, and stable. +On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, and eoan have the package. +If you're running any of them, `sudo apt-get install obfs4proxy` should work. If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installation). - ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` @@ -30,41 +31,39 @@ ORPort TODO ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with -# Tor and censors may be scanning the Internet for this port. +# Replace "TODO" with an obfs4 port of your choice. This port must be externally reachable. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ServerTransportListenAddr obfs4 0.0.0.0:TODO # Local communication port between Tor and obfs4. Always set this to "auto". -# "Ext" means "extended", not "external". Don't try to set a specific port -# number, nor listen on 0.0.0.0. +# "Ext" means "extended", not "external". Don't try to set a specific port number, nor listen on 0.0.0.0. ExtORPort auto -# Replace "<address(a)email.com>" with your email address so we can contact you if -# there are problems with your bridge. This is optional but encouraged. +# Replace "<address(a)email.com>" with your email address so we can contact you if there are problems with your bridge. +# This is optional but encouraged. ContactInfo <address(a)email.com> # Pick a nickname that you like for your bridge. This is optional. Nickname PickANickname ``` +Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. - Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. - -* If you decide to use a fixed obfs4 port smaller than 1024 (for example 80 or 443), you will need to give obfs4 `CAP_NET_BIND_SERVICE` capabilities to bind the port with a non-root user: - +* If you decide to use a fixed obfs4 port smaller than 1024 (for example 80 or 443), you will need to give obfs4 `CAP_NET_BIND_SERVICE` capabilities to bind the port with a non-root user: -`sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy` + `sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy` * Under Debian, you will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) -* Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. +* Note that both Tor's OR port and its obfs4 port must be reachable. + If your bridge is behind a firewall or NAT, make sure to open both ports. + You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. ### 4. Restart tor `systemctl restart tor` -### 5. Monitor your logs +### 5. Monitor your logs To confirm your bridge is running with no issues, you should see something like this (usually in `/var/log/tor/log` or `/var/log/syslog`):

1 0

[community/staging] State that FreeBSD's firewall may get in the way. ref: https://github.com/torproject/community/pull/5
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 09753a2017bc986bb89830e8416eb25261357b26 Merge: 78e52e3 3ddf6ec Author: emma peel <emma.peel(a)riseup.net> Date: Wed Aug 21 19:51:50 2019 +0200 State that FreeBSD's firewall may get in the way. ref: https://github.com/torproject/community/pull/5

1 0

[community/staging] Use menu databags from lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 741a2a4a607706b9d8f81f97d0c61469a9e00a52 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:33:38 2019 +0200 Use menu databags from lego --- databags/menu+bn-BD.ini | 1 + databags/menu+de.ini | 20 +------------------- databags/menu+en.ini | 24 +----------------------- databags/menu+es.ini | 2 +- databags/menu+fr.ini | 2 +- databags/menu+id.ini | 1 + databags/menu+is.ini | 1 + databags/menu+it.ini | 2 +- databags/menu+ka.ini | 1 + databags/menu+ko.ini | 1 + databags/menu+pt-BR.ini | 2 +- databags/menu+ru.ini | 2 +- databags/menu+tr.ini | 1 + databags/menu+zh-CN.ini | 1 + databags/menu_footer+bn-BD.ini | 1 + databags/menu_footer+de.ini | 2 +- databags/menu_footer+en.ini | 16 +--------------- databags/menu_footer+es.ini | 2 +- databags/menu_footer+fr.ini | 2 +- databags/menu_footer+id.ini | 1 + databags/menu_footer+is.ini | 1 + databags/menu_footer+it.ini | 2 +- databags/menu_footer+ka.ini | 1 + databags/menu_footer+ko.ini | 1 + databags/menu_footer+pt-BR.ini | 2 +- databags/menu_footer+ru.ini | 2 +- databags/menu_footer+tr.ini | 1 + databags/menu_footer+zh-CN.ini | 1 + lego | 2 +- 29 files changed, 29 insertions(+), 69 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini new file mode 120000 index 0000000..c9b2dc8 --- /dev/null +++ b/databags/menu+bn-BD.ini @@ -0,0 +1 @@ +../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 100644 index 1bd9e8a..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = https://www.torproject.org/de/about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/de/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/de -label = Donate diff --git a/databags/menu+de.ini b/databags/menu+de.ini new file mode 120000 index 0000000..6bb02de --- /dev/null +++ b/databags/menu+de.ini @@ -0,0 +1 @@ +../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 100644 index cce7df9..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/about/history -label = About - -[community] -path = https://community.torproject.org/ -label = Community - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donate diff --git a/databags/menu+en.ini b/databags/menu+en.ini new file mode 120000 index 0000000..1fa7edf --- /dev/null +++ b/databags/menu+en.ini @@ -0,0 +1 @@ +../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 23a525b..fd8def3 120000 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 23a525b..5366289 120000 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini new file mode 120000 index 0000000..7c2858b --- /dev/null +++ b/databags/menu+id.ini @@ -0,0 +1 @@ +../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini new file mode 120000 index 0000000..b02aed7 --- /dev/null +++ b/databags/menu+is.ini @@ -0,0 +1 @@ +../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini index 23a525b..fcdde73 120000 --- a/databags/menu+it.ini +++ b/databags/menu+it.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini new file mode 120000 index 0000000..336d4ad --- /dev/null +++ b/databags/menu+ka.ini @@ -0,0 +1 @@ +../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini new file mode 120000 index 0000000..31e262b --- /dev/null +++ b/databags/menu+ko.ini @@ -0,0 +1 @@ +../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 23a525b..fd27afb 120000 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini index 23a525b..6f30a3e 120000 --- a/databags/menu+ru.ini +++ b/databags/menu+ru.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini new file mode 120000 index 0000000..8a01592 --- /dev/null +++ b/databags/menu+tr.ini @@ -0,0 +1 @@ +../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini new file mode 120000 index 0000000..425a6f8 --- /dev/null +++ b/databags/menu+zh-CN.ini @@ -0,0 +1 @@ +../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini new file mode 120000 index 0000000..5dd8aed --- /dev/null +++ b/databags/menu_footer+bn-BD.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini index a3178a1..851da53 120000 --- a/databags/menu_footer+de.ini +++ b/databags/menu_footer+de.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 100644 index b97b531..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = https://www.torproject.org/about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = https://www.torproject.org/contact -label = Contact - -[press] -path = https://www.torproject.org/press -label = Press diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+en.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini index a3178a1..c52cdcb 120000 --- a/databags/menu_footer+es.ini +++ b/databags/menu_footer+es.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini index a3178a1..7ce02c3 120000 --- a/databags/menu_footer+fr.ini +++ b/databags/menu_footer+fr.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini new file mode 120000 index 0000000..056defd --- /dev/null +++ b/databags/menu_footer+id.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini new file mode 120000 index 0000000..2474621 --- /dev/null +++ b/databags/menu_footer+is.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini index a3178a1..8225a53 120000 --- a/databags/menu_footer+it.ini +++ b/databags/menu_footer+it.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini new file mode 120000 index 0000000..fd41467 --- /dev/null +++ b/databags/menu_footer+ka.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini new file mode 120000 index 0000000..6ff3bf2 --- /dev/null +++ b/databags/menu_footer+ko.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini index a3178a1..5198e0f 120000 --- a/databags/menu_footer+pt-BR.ini +++ b/databags/menu_footer+pt-BR.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini index a3178a1..ad782bc 120000 --- a/databags/menu_footer+ru.ini +++ b/databags/menu_footer+ru.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini new file mode 120000 index 0000000..2c88858 --- /dev/null +++ b/databags/menu_footer+tr.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini new file mode 120000 index 0000000..0fd8366 --- /dev/null +++ b/databags/menu_footer+zh-CN.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/lego b/lego index 9c33e2b..aa31aec 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 9c33e2b8740728dc9de4c64915460b76fc7c4061 +Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17

1 0

[community/staging] add edit button to two colum pages
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit b80d15bb8b410df5f3d6e3437afcdb71aaa1c52d Author: emma peel <emma.peel(a)riseup.net> Date: Thu Aug 22 16:42:27 2019 +0200 add edit button to two colum pages --- templates/two-columns-page.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 0bd9569..4ccb30e 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -14,6 +14,13 @@ </div> {% endfor %} </div> - <a href="{{ this.parent|url }}">Back to {{ this.parent.title }}</a> + <div class="card mt-5"> + <ul class="list-group list-group-flush"> +  + <li class="list-group-item"> + <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> + </li> + </ul> + </div> </div> </div> \ No newline at end of file

1 0

[community/staging] Turn bullet point into paragraph.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3eb5e6f435b58ee43cd0afb921fc7605fd17cb52 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 26 17:24:46 2019 -0700 Turn bullet point into paragraph. The bullet point wants to be a paragraph because it's not related to the other two bullet points. Thanks to Roger for pointing this out. --- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 16037a4..8273f8f 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -52,12 +52,12 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, `sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy` -* Under Debian, you will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) - * Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. +Under Debian, you will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) + ### 4. Restart tor `systemctl restart tor`

1 0

[community/staging] Partially revert commit 404d5ca.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 34fb51d704d236736e4b85287775394c9ff1072a Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 27 10:02:01 2019 -0700 Partially revert commit 404d5ca. Only Debian is known to set RunAsDaemon to 1 by default. We don't know about the other tor distributions. Let's keep 'RunAsDaemon 1' for the other distributions. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 1 + content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 1 + content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 1 + 3 files changed, 3 insertions(+) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 5fba1a6..091dbb5 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -43,6 +43,7 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` +RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 0741c8c..d4bb28e 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -17,6 +17,7 @@ pkg install obfs4proxy-tor tor ca_root_nss ### 2. Edit your Tor config file, usually located at `/usr/local/etc/tor` and replace its content with: ``` +RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 1c95aaa..d2e05a8 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -18,6 +18,7 @@ pkg_add tor obfs4proxy Usually located at `/etc/tor/torrc`, and replace its content with: ``` +RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally

1 0

[community/staging] Add instructions to automatically update your Debian or Ubuntu relay, include post-install link
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit f99e8e40efe601ca7cb50deb9a981e7d6783ed76 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 05:17:15 2019 -0400 Add instructions to automatically update your Debian or Ubuntu relay, include post-install link --- .../technical-setup/guard/debianubuntu/contents.lr | 16 ++++-- .../guard/debianubuntu/updates/contents.lr | 61 ++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index f7992dd..2a8bedb 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -4,17 +4,21 @@ title: Debian/Ubuntu --- body: -# 1. Configure Tor Package Repository +# 1. Enable Automatic Software Updates + +One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system. + +# 2. Configure Tor Package Repository Enable the Torproject package repository by following the instructions **[here](https://2019.www.torproject.org/docs/debian.html.en#ubuntu)**. -# 2. Package Installation +# 3. Package Installation Install the `tor` package: `apt update && apt install tor` -# 3. Configuration File +# 4. Configuration File Put the configuration file `/etc/tor/torrc` in place: @@ -29,11 +33,15 @@ ControlSocket 0 ContactInfo tor-operator@your-emailaddress-domain ``` -# 4. Restart the Service +# 5. Restart the Service Restart the tor daemon so your configuration changes take effect: `systemctl restart tor@default` + +# 6. Final notes + +If you are having troubles setting up your relay, have a look at our [help section](FIXME). If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. --- html: two-columns-page.html --- diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr new file mode 100644 index 0000000..05da34b --- /dev/null +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -0,0 +1,61 @@ +_model: page +--- +title: Debian Ubuntu Updates +--- +_discoverable: yes +--- +_hidden: yes +--- +body: + +# 1. Install the required packages + +``` +apt-get install unattended-upgrades apt-listchanges +``` + +# 2. Edit the configuration file + +Put the lines below into the configuration file /etc/apt/apt.conf.d/50unattended-upgrades, everything that was originally inside the generated file can be removed before you add the lines below. + +``` + Unattended-Upgrade::Origins-Pattern { + "origin=Debian,codename=${distro_codename},label=Debian-Security"; + "origin=TorProject"; + }; + Unattended-Upgrade::Package-Blacklist { + }; +``` + +#3. Automatically reboot + +If you want to automatically reboot add the following at the the end of the file `/etc/apt/apt.conf.d/50unattended-upgrades`: + +``` + Unattended-Upgrade::Automatic-Reboot "true"; + + Create the file /etc/apt/apt.conf.d/20auto-upgrades with the following content + + APT::Periodic::Update-Package-Lists "1"; + APT::Periodic::AutocleanInterval "5"; + APT::Periodic::Unattended-Upgrade "1"; + APT::Periodic::Verbose "1"; +``` + +# 4. Test + +You can test your unattended-upgrades setup with the following command: + +``` + sudo unattended-upgrade -d +``` +--- +html: two-columns-page.html +--- +key: 1 +--- +section: Relays Operations +--- +section_id: relays-operations +--- +_slug: updates

1 0

[community/staging] Link to post-install notes at the end.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit c1ec459a95cbcd4d6362fa67014d3820dc9e3b4a Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 26 18:02:53 2019 -0700 Link to post-install notes at the end. Once somebody is done following the instructions, we should explicitly point them to our post-install notes because they are otherwise easy to miss. Thanks to Roger for pointing this out. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 7 +++++++ .../technical-setup/bridge/debian-ubuntu/contents.lr | 8 ++++++++ .../relay-operations/technical-setup/bridge/docker/contents.lr | 7 ++++++- .../relay-operations/technical-setup/bridge/freebsd/contents.lr | 7 +++++++ .../relay-operations/technical-setup/bridge/openbsd/contents.lr | 8 ++++++++ 5 files changed, 36 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index f142d56..5fba1a6 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -92,6 +92,13 @@ To confirm your bridge is running with no issues, you should see something like [notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` +### 6. Final notes + +If you are having troubles setting up your bridge, have a look at [our help +section](https://community.torproject.org/relay/setup/bridge/getting-help/). If +your bridge is now running, check out the [post-install +notes](https://community.torproject.org/relay/setup/bridge/post-install/). + --- html: two-columns-page.html --- diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 8273f8f..d1eeb17 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -76,6 +76,14 @@ To confirm your bridge is running with no issues, you should see something like [notice] Now checking whether ORPort <redacted>:3818 is reachable... (this may take up to 20 minutes -- look for log messages indicating success) [notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` + +### 6. Final notes + +If you are having troubles setting up your bridge, have a look at [our help +section](https://community.torproject.org/relay/setup/bridge/getting-help/). If +your bridge is now running, check out the [post-install +notes](https://community.torproject.org/relay/setup/bridge/post-install/). + --- key: 1 --- diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ca3d7f7..1c36012 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -14,7 +14,12 @@ Now, it's time to run the container. We maintain a script that automatically de $ bash deploy-container.sh address(a)email.com ``` -That's it! Your container should now be bootstrapping your new obfs4 Tor bridge. +That's it! Your container should now be bootstrapping your new obfs4 Tor bridge. +Make sure to check out the [post-install +notes](https://community.torproject.org/relay/setup/bridge/post-install/). If +you are having troubles setting up your bridge, have a look at [our help +section](https://community.torproject.org/relay/setup/bridge/getting-help/). + --- html: two-columns-page.html --- diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 78373df..0741c8c 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -103,6 +103,13 @@ FreeBSDlatest: { } ``` +### 7. Final notes + +If you are having troubles setting up your bridge, have a look at [our help +section](https://community.torproject.org/relay/setup/bridge/getting-help/). If +your bridge is now running, check out the [post-install +notes](https://community.torproject.org/relay/setup/bridge/post-install/). + --- subtitle: How to deploy an obfs4 bridge on FreeBSD --- diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 0a02f9e..1c95aaa 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -72,6 +72,14 @@ To confirm your bridge is running with no issues, you should see something like [notice] Now checking whether ORPort <redacted>:3818 is reachable... (this may take up to 20 minutes -- look for log messages indicating success) [notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` + +### 5. Final notes + +If you are having troubles setting up your bridge, have a look at [our help +section](https://community.torproject.org/relay/setup/bridge/getting-help/). If +your bridge is now running, check out the [post-install +notes](https://community.torproject.org/relay/setup/bridge/post-install/). + --- subtitle: How to deploy an obfs4 bridge on OpenBSD ---

1 0

[community/staging] Remove 'RunAsDaemon 1'.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 404d5cac9673b6b363414680521d1381aeb1944d Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 26 17:10:51 2019 -0700 Remove 'RunAsDaemon 1'. This is already set by default. Thanks to Roger for pointing this out. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 1 - .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 1 - content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 1 - content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 1 - 4 files changed, 4 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 14d6e04..f142d56 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -43,7 +43,6 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index e68a4da..16037a4 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -21,7 +21,6 @@ If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installa ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 2ec5c8e..78373df 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -17,7 +17,6 @@ pkg install obfs4proxy-tor tor ca_root_nss ### 2. Edit your Tor config file, usually located at `/usr/local/etc/tor` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index bf7d98a..0a02f9e 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -18,7 +18,6 @@ pkg_add tor obfs4proxy Usually located at `/etc/tor/torrc`, and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally

1 0

[community/staging] Changed the page title to be consistent
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 56f0ae2f1c3a8fd6db1320f8fb0341db01b2c41a Author: gus <gus(a)torproject.org> Date: Thu Aug 29 06:28:38 2019 -0400 Changed the page title to be consistent --- .../technical-setup/guard/debianubuntu/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr index 05da34b..39c6547 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -1,6 +1,6 @@ _model: page --- -title: Debian Ubuntu Updates +title: Automatic updates on Debian and Ubuntu --- _discoverable: yes ---

1 0