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

[community/staging] Fixed - updates page was not showing
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit e9db7674ca5c01ee6e511108dc9be50bb200c18d Author: gus <gus(a)torproject.org> Date: Thu Aug 29 12:31:26 2019 -0400 Fixed - updates page was not showing --- .../relay-operations/technical-setup/guard/debianubuntu/contents.lr | 2 ++ content/relay-operations/technical-setup/guard/fedora/contents.lr | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index f03d90f..f203181 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -52,3 +52,5 @@ section: Middle/Guard relay section_id: relay-operations --- subtitle: How to deploy a middle/Guard relay on Debian/Ubuntu +--- +_discoverable: yes diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index 8182829..2653fa3 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -43,3 +43,7 @@ section: Middle/Guard relay section_id: relay-operations --- subtitle: How to deploy a middle/Guard relay on Fedora +--- +_discoverable: no +--- +_slug: updates

1 0

[community/staging] Change page title and section, make lektor generate page
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 686d7afd57578ea7fa4eaa208bcab14ded329d2c Author: gus <gus(a)torproject.org> Date: Thu Aug 29 11:49:36 2019 -0400 Change page title and section, make lektor generate page --- .../technical-setup/guard/freebsd/updates/contents.lr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6746558..e7411ed 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -1,8 +1,8 @@ _model: page --- -title: Automatic Updates on BSD* +title: BSD* --- -_hidden: yes +_discoverable: no --- _slug: updates --- @@ -38,8 +38,8 @@ env AUTOCLEAN=YES ASSUME_ALWAYS_YES=YES HANDLE_RC_SCRIPTS=YES pkg upgrade --- html: two-columns-page.html --- -section: relay operations +section: Automatic Updates --- -section_id: relay-operations +section_id: automatic-updates --- key: 1

1 0

[community/staging] Add color to pages in relay guide
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 888f513552e6c9584bea2b8e00bbfd06572a99c7 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 30 13:11:08 2019 +0200 Add color to pages in relay guide --- .../technical-setup/guard/centosrhel/contents.lr | 2 ++ .../technical-setup/guard/centosrhel/updates/contents.lr | 4 +++- .../technical-setup/guard/debianubuntu/contents.lr | 2 ++ .../technical-setup/guard/debianubuntu/updates/contents.lr | 10 ++++++---- .../relay-operations/technical-setup/guard/fedora/contents.lr | 4 +++- .../technical-setup/guard/fedora/updates/contents.lr | 2 ++ .../relay-operations/technical-setup/guard/freebsd/contents.lr | 6 ++++-- .../technical-setup/guard/freebsd/updates/contents.lr | 2 ++ 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr index 18eb67a..6914e5b 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: CentOS/RHEL --- body: diff --git a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr index 543587d..24adef4 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: RPM Distributions --- body: @@ -46,7 +48,7 @@ Enable the following settings: Interval: Daily Skip Interactive Patches Agree with Licenses - Use delta rpms + Use delta rpms ``` Confirm your configuration with OK. diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index f203181..20b6619 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian/Ubuntu --- body: 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 7053759..0506f6c 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Debian and Ubuntu --- _discoverable: no @@ -34,10 +36,10 @@ If you want to automatically reboot add the following at the the end of the file 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"; + APT::Periodic::Update-Package-Lists "1"; + APT::Periodic::AutocleanInterval "5"; + APT::Periodic::Unattended-Upgrade "1"; + APT::Periodic::Verbose "1"; ``` # 4. Test diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index 0e5f8ac..646fa22 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Fedora --- body: @@ -46,4 +48,4 @@ subtitle: How to deploy a middle/Guard relay on Fedora --- _discoverable: yes --- -_slug: +_slug: diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr index f8195b7..7f31083 100644 --- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr @@ -4,6 +4,8 @@ title: Fedora --- subtitle: --- +color: primary +--- _slug: updates --- diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/contents.lr index 1685fed..9d96639 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: FreeBSD --- body: @@ -47,11 +49,11 @@ service tor start To get package updates faster after they have been build it is best to switch from the "quarterly" with "latest" repository. -Create the following folder: +Create the following folder: `mkdir -p /usr/local/etc/pkg/repos` -and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: +and create the file `/usr/local/etc/pkg/repos/FreeBSD.conf` with the following content: ``` FreeBSD: { enabled: no } 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 ad9959f..86c1638 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: BSD* --- +color: primary +--- _slug: updates --- body:

1 0

[community/staging] Fix port number ambiguity and path issue
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit a6a8c35908c2db13d2eaa59d1d54a1319a082dc4 Author: Ken Kundert <thenurd(a)nurdletech.com> Date: Fri Aug 30 12:48:27 2019 -0700 Fix port number ambiguity and path issue When I read this I was stumped for a while by the fact that the same name was used for what I believe should be two different values. TODO was used for both the ORPort and the obfs4 port.. I tried to make it clear that these should be two different ports. Also, you install obfs4 into /usr/local/bin but then configured tor to use /usr/bin. Some issues I was unable to resolve: 1. on CentOS Linux release 7.6.1810 I was unable to install obfs4 using 'go get'. go get gitlab.com/yawning/obfs4.git/obfs4proxy # cd .; git clone https://gitlab.com/yawning/utls /tmp/tmp.HMbPtKs8RV/src/gitlab.com/yawning/utls.git error: RPC failed; result=22, HTTP code = 404 fatal: The remote end hung up unexpectedly package gitlab.com/yawning/utls.git: exit status 128 2. On Fedora 30 I was able to install obfs4, but I struggled with selinux. I needed: /sbin/restorecon -v /usr/local/bin/obfs4proxy Relabeled /usr/local/bin/obfs4proxy from system_u:object_r:tor_exec_t:s0 to system_u:object_r:bin_t:s0 and semanage port -a -t tor_port_t -p tcp 4151 to get things working. I suspect your suggested chcon was ill-advised and resulted in the need for me to run restorecon. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 2d232a7..43f3883 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 @@ -48,17 +48,18 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor 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. -ORPort TODO +ORPort TODO1 -ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/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 +# 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. +# 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 +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # 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

1 0

[community/staging] Added Fedora Instructions
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit ea704abd8de6908876106b4881844f3299a6ae34 Author: Christopher King <bunnyapocalypse(a)protonmail.com> Date: Fri Aug 30 23:55:39 2019 +0000 Added Fedora Instructions So this is what I needed to do in order to get my fedora server up and running as a bridge, and I've added these instructions as if these problems only affect Fedora users, but I would be surprised if that's the case, because the alternative ports that are encouraged in this guide for ORPort and ServerTransportListenAddr are exactly what selinux is supposed to stop. Because of that, I'd imagine that this would function the same on CentOS SUSE and RHEL. As for why the fedora instructions install the executable into normal bin, that's because you run into selinux problems there too when it's in /usr/local/bin , but problems that were more complicated than my tiny selinux knowledge can deal with. policycoreutils-python-utils is needed for semanage. --- .../bridge/centos-rhel-opensuse/contents.lr | 56 ++++++++++++++++++++++ 1 file changed, 56 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 16e12e5..0ecdfc5 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 @@ -21,6 +21,12 @@ yum install git golang tor zypper install tor go git ``` +* Fedora: + +``` +dnf install git golang tor policycoreutils-python-utils +``` + ### 2. Build obfs4proxy and move it into place. Heavily outdated versions of git can make `go get` fail, so try upgrading to a more recent git version if you're running into this problem. @@ -42,8 +48,18 @@ go get gitlab.com/yawning/obfs4.git/obfs4proxy sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ ``` +* Fedora: + +``` +export GOPATH=`mktemp -d` +go get gitlab.com/yawning/obfs4.git/obfs4proxy +sudo cp $GOPATH/bin/obfs4proxy /usr/bin/ +``` + ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: +* CentOS / RHEL / OpenSUSE: + ``` RunAsDaemon 1 BridgeRelay 1 @@ -69,6 +85,36 @@ ExtORPort auto # 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 +``` +* Fedora: + +``` +RunAsDaemon 1 +BridgeRelay 1 + +# Replace "TODO" with a Tor 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. +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. +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. +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. +ContactInfo <address(a)email.com> + # Pick a nickname that you like for your bridge. This is optional. Nickname PickANickname ``` @@ -79,8 +125,18 @@ Nickname PickANickname ### 4. Restart tor +* CentOS / RHEL / OpenSUSE: + `systemctl restart tor` +* Fedora: + +``` +sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier] +sudo semanage port -a -t tor_port_t -p tcp [desired ServerTransportListenAddr port number set earlier] +systemctl restart tor +``` + ### 5. Monitor your logs (usually in your syslog) To confirm your bridge is running with no issues, you should see something like this:

1 0

[community/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/community
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3bf61005eb5acb94edfb805f849699c7b5bea4ec Merge: 183e81b 888f513 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Aug 30 15:50:27 2019 -0700 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/community .../technical-considerations/contents.lr | 9 --- .../bridge/centos-rhel-opensuse/contents.lr | 14 +++-- .../bridge/debian-ubuntu/contents.lr | 2 + .../technical-setup/bridge/docker/contents.lr | 2 + .../technical-setup/bridge/freebsd/contents.lr | 6 +- .../bridge/getting-help/contents.lr | 2 + .../technical-setup/guard/centosrhel/contents.lr | 22 +++++-- .../guard/centosrhel/updates/contents.lr | 68 ++++++++++++++++++++++ .../technical-setup/guard/debianubuntu/contents.lr | 24 ++++++-- .../guard/debianubuntu/updates/contents.lr | 61 +++++++++++++++++++ .../technical-setup/guard/fedora/contents.lr | 24 ++++++-- .../guard/fedora/updates/contents.lr | 32 ++++++++++ .../technical-setup/guard/freebsd/contents.lr | 25 +++++--- .../guard/freebsd/updates/contents.lr | 45 ++++++++++++++ 14 files changed, 294 insertions(+), 42 deletions(-)

1 0

[community/staging] Update contents.lr
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit f6ad45777107b298c06f9a56edbd5bc8dcbefa5a Author: Christopher King <bunnyapocalypse(a)protonmail.com> Date: Sat Aug 31 19:24:11 2019 +0000 Update contents.lr --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 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 0ecdfc5..915cfa6 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 @@ -12,7 +12,7 @@ body: ``` yum install epel-release -yum install git golang tor +yum install git golang tor policycoreutils-python-utils ``` * OpenSUSE: @@ -129,7 +129,7 @@ Nickname PickANickname `systemctl restart tor` -* Fedora: +* Fedora / RHEL / CentOS: ``` sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier]

1 0

[community/staging] Fix file path.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 183e81bbda03873177d984463fd56002ac54bad1 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Aug 30 15:49:05 2019 -0700 Fix file path. Thanks to BunnyApocalypse for pointing out this mistake in #tor-relays. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- 1 file changed, 1 insertion(+), 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 091dbb5..b79fc24 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 @@ -51,7 +51,7 @@ BridgeRelay 1 # censors may be scanning the Internet for this port. ORPort TODO -ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/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

1 0

[community/staging] Change small typo
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 740035958c285f1d688f2951390e87108009351e Author: Christopher King <bunnyapocalypse(a)protonmail.com> Date: Sat Aug 31 16:59:30 2019 +0000 Change small typo I'm still investigating whether or not you run into the same problems that I did on Fedora in other selinux enabled systems (CentOS/RHEL). But I noticed this little thing as well, so I figured I might as well change it --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- 1 file changed, 1 insertion(+), 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 16e12e5..1963cab 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 @@ -8,7 +8,7 @@ body: ### 1. Install tor and dependencies -* Redhat / RHEL: +* CentOS / RHEL: ``` yum install epel-release

1 0

[community/staging] Remove full mailing list address and include irc.oftc.net
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 098972a6ff34d403e52862a1137e47d7a4c55c18 Author: gus <gus(a)torproject.org> Date: Mon Sep 2 14:27:25 2019 -0400 Remove full mailing list address and include irc.oftc.net --- templates/relay-operations.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/relay-operations.html b/templates/relay-operations.html index 2ebeb5f..7690b3b 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -21,7 +21,7 @@ </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Connect with other Relay Operators') }}</h2> - <p class="text-center">{{ _('The best resource of all is the active community of relay operators on tor-relays(a)lists.torproject.org and on IRC in #tor-relays. ') }}</p> + <p class="text-center">{{ _('The best resource of all is the active community of relay operators on tor-relays mailing list and on IRC #tor-relays in irc.oftc.net. ') }}</p> <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"> {{ _('Relay Operators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> </a>

1 0