September 2019 - tor-commits - lists.torproject.org

[community/develop] Fix breadcrumbs
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 6b1fff604fd0af4e5addbb74b61e3a574824e45e Author: hiro <hiro(a)torproject.org> Date: Thu Sep 12 18:25:30 2019 +0200 Fix breadcrumbs --- content/relay-operations/technical-setup/guard/contents.lr | 2 ++ templates/breadcrumb.html | 1 + templates/macros/parent.html | 1 + templates/macros/resources.html | 9 +-------- templates/two-columns-page.html | 1 + 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/contents.lr b/content/relay-operations/technical-setup/guard/contents.lr index 7cfa3dd..2e4fb97 100644 --- a/content/relay-operations/technical-setup/guard/contents.lr +++ b/content/relay-operations/technical-setup/guard/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Middle/Guard relay --- body: In this guide we describe how to setup a new Middle/Guard relay. Please choose your platform below. diff --git a/templates/breadcrumb.html b/templates/breadcrumb.html new file mode 120000 index 0000000..583e450 --- /dev/null +++ b/templates/breadcrumb.html @@ -0,0 +1 @@ +../lego/templates/breadcrumb.html \ No newline at end of file diff --git a/templates/macros/parent.html b/templates/macros/parent.html new file mode 120000 index 0000000..14b7799 --- /dev/null +++ b/templates/macros/parent.html @@ -0,0 +1 @@ +../../lego/templates/macros/parent.html \ No newline at end of file diff --git a/templates/macros/resources.html b/templates/macros/resources.html deleted file mode 100644 index e632faf..0000000 --- a/templates/macros/resources.html +++ /dev/null @@ -1,8 +0,0 @@ -{% macro render_resource(item) %} -<tr> - <td><a href="{{ item|url }}">{{ item.file }}</a></td> - <td>{{ item.description }}</td> - <td>{{ item.type}}</td> - <td>{{ item.date }}</td> -</tr> -{% endmacro %} diff --git a/templates/macros/resources.html b/templates/macros/resources.html new file mode 120000 index 0000000..fa7524a --- /dev/null +++ b/templates/macros/resources.html @@ -0,0 +1 @@ +../../lego/templates/macros/resources.html \ No newline at end of file diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 199a452..a4fa3f6 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -1,6 +1,7 @@ <div class="row pt-5"> {% include 'sidenav.html' %} <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> + {% include 'breadcrumb.html' %} {{ this.body }} <div class="row"> {% for child in this.children|sort(attribute='key') %}

1 0

[community/develop] Change obfs4proxy patch in OpenBSD install doc
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 2892268500513d4a14208716652a911cd3f1951f Author: Nick Gnazzo <nickgnazzo(a)icloud.com> Date: Thu Sep 12 13:11:52 2019 -0400 Change obfs4proxy patch in OpenBSD install doc By default, the 'obfs4proxy' in OpenBSD 6.5 seems to install the obfs4proxy binary in /usr/local/bin, as opposed to /usr/bin. --- content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 55b8f60..7bb27e3 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -26,7 +26,7 @@ BridgeRelay 1 # censors may be scanning the Internet for this port. ORPort TODO1 -ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy # Replace "TODO2" with an obfs4 port of your choice. This port must be # externally reachable and must be different from the one specified for ORPort.

1 0

[community/develop] Update Docker container version to 0.2.
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit fd8a9e54a27474fe038a9dcbcb6021b68b2070d4 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 14:06:39 2019 -0700 Update Docker container version to 0.2. --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ef601f1..bf5f5b1 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,7 +8,7 @@ body: We are maintaining a docker container that allows you to quickly set up an obfs4 bridge. First, fetch the container: -`docker pull phwinter/obfs4-bridge:0.1` +`docker pull phwinter/obfs4-bridge:0.2` Now, it's time to run the container. We maintain a script that automatically determines a free OR and obfs4 port for you. The script only requires your email address as argument: ```

1 0

[community/develop] Ops! Small typo
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit e39ae5def9e993586e87637ed606bcaac592f569 Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Sep 5 17:30:39 2019 -0400 Ops! Small typo --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index 1abf4a5..c7b57ff 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -1,6 +1,6 @@ _model: page --- -title: BSD* +title: *BSD --- color: primary ---

1 0

[community/develop] Update contents.lr
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 9b39d2af5294ecf063273c446dc6c0996d1cb9f3 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Mon Sep 16 15:56:19 2019 +0000 Update contents.lr --- content/onion-services/overview/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index b8dd03f..869db5e 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -6,9 +6,9 @@ color: primary --- _template: layout.html --- -title: How do .onion Services work? +title: How do onion services work? --- -subtitle: Learn how .onion services work. +subtitle: Learn how onion services work. --- key: 0 --- @@ -20,7 +20,7 @@ Onion services are services that can only be accessed over Tor. Running an onion ## Why onion services? -Onion services offer various security benefits to their users, that are not usually given on the normal web. In particular: +Onion services offer various privacy and security benefits to their users. ### Location hiding

1 0

[community/develop] Use menu databags from lego
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit c491e3f0a849b6f2f92c7531c9346f3b37154497 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 + 28 files changed, 28 insertions(+), 68 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

1 0

[community/develop] Remove 'RunAsDaemon 1'.
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit edb335dda61020d7d21a5eb0e2e5bbe79a316458 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/develop] better strings for l10n
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 736ba3fedfd95bdfe4d6ab97bf4ceb327f901b08 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/develop] Turn bullet point into paragraph.
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 040a0c447f0c0497640a0c825ba60326b052aa70 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/develop] Add Fedora instructions to automatically update relay, link to post-install instructions
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 2958e79ec715e21d2607131b521bcd2eaa4861f8 Author: gus <gus(a)torproject.org> Date: Thu Aug 29 06:27:44 2019 -0400 Add Fedora instructions to automatically update relay, link to post-install instructions --- .../technical-setup/guard/fedora/contents.lr | 14 +++++++-- .../guard/fedora/updates/contents.lr | 33 ++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index cc984cc..5cfcf23 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -4,11 +4,15 @@ title: Fedora --- body: -# 1. Install the tor package: +# 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. Install the tor package `dnf install tor` -# 2. Put the tor configuration file `/etc/tor/torrc` in place: +# 3. Put the tor configuration file `/etc/tor/torrc` in place ``` #change the nickname "myNiceRelay" to a name that you like @@ -19,12 +23,16 @@ ExitRelay 0 ContactInfo tor-operator@your-emailaddress-domain ``` -# 3. Start the tor daemon and make sure it starts at boot: +# 4. Start the tor daemon and make sure it starts at boot ``` systemctl enable tor systemctl start tor ``` + +# 5. 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/fedora/updates/contents.lr b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr new file mode 100644 index 0000000..03ad164 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr @@ -0,0 +1,33 @@ +_model: page +--- +title: Automatic Updates on Fedora +--- +body: + +On Fedora you enable automatic updates via: + +``` +dnf install dnf-automatic +``` + +Now enable and start automatic updates via: + +``` +systemctl enable --now dnf-automatic-install.timer +``` +--- +html: two-columns-page.html +--- +key: 1 +--- +section: Relay operations +--- +section_id: relay-operations +--- +subtitle: +--- +_hidden: yes +--- +_slug: updates +--- +_discoverable: no

1 0