[tor-commits] [community/translations] update contents
emmapeel at torproject.org
emmapeel at torproject.org
Tue Oct 26 16:55:00 UTC 2021
commit d6d0fc9480ec0ece73ad8989d648f19c1d6d3007
Author: emma peel <emma.peel at riseup.net>
Date: Tue Oct 26 18:54:31 2021 +0200
update contents
---
.../community-resources/good-bad-isps/contents.lr | 11 ++-
content/relay/setup/guard/centos-rhel/contents.lr | 95 ++++++++++++++++++++++
.../setup/guard/centos-rhel/updates/contents.lr | 94 +++++++++++++++++++++
.../relay/setup/guard/debian-ubuntu/contents.lr | 62 ++++++++++++++
.../setup/guard/debian-ubuntu/updates/contents.lr | 63 ++++++++++++++
content/relay/setup/guard/dragonflybsd/contents.lr | 61 +++++++-------
content/relay/setup/guard/fedora/contents.lr | 35 ++++----
content/relay/setup/guard/freebsd/contents.lr | 53 ++++++------
content/relay/setup/guard/netbsd/contents.lr | 38 ++++++---
content/relay/setup/guard/openbsd/contents.lr | 61 ++++++++------
content/relay/setup/post-install/contents.lr | 1 +
templates/home.html | 2 +-
templates/homepage.html | 4 +-
templates/localization.html | 4 +-
templates/two-columns-page.html | 4 +-
templates/user-research.html | 2 +-
16 files changed, 468 insertions(+), 122 deletions(-)
diff --git a/content/relay/community-resources/good-bad-isps/contents.lr b/content/relay/community-resources/good-bad-isps/contents.lr
index 455bc47..98026f7 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -21,6 +21,8 @@ For network diversity and stronger anonymity, you should avoid providers and cou
* Hetzner Online GmbH (AS24940)
* DigitalOcean, LLC (AS14061)
+These hosts already have many tor nodes being hosted there.
+
**Note**: This page is currently being revamped. If you would like to help out please see [#72](https://gitlab.torproject.org/tpo/web/community/-/issues/72).
# Good Experiences
@@ -68,7 +70,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
| [Online.net](http://www.online.net/) | AS12876 | Yes | Yes | Yes | The account holder is responsible for all the traffic going through theirs servers.| 01/28/2019 |
| [Gandi VPS](https://www.gandi.net/) | - | Yes | Yes | Yes| Gandi send some abuse complaints to Exit relays, but they do not stop the server, and when you tell them your server is a Tor Exit relay, they say it is OK. They ask Exit relays to use the standard Reduced Exit Policy | - |
-| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. Running a Tor exit node is strictly forbidden and can lead to the suspension and even termination of your server and account." | 09/27/2021 |
+| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. Running a Tor exit node is strictly forbidden and can lead to the suspension and even termination of your server and account." Locations: FR,CA | 09/27/2021 |
| [Digicube](http://www.digicube.fr/) | - | Yes | Yes | Yes | - | - |
| [Pulse Servers](http://www.pulseservers.com/) | AS16276 | Yes | Yes | Yes | VPS uses OVH AS. You can build ANY kind tor relays. | 09/27/2021 |
@@ -96,7 +98,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou
| [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - | 2018-10-25 |
| [linevast](https://www.linevast.de) | AS201206 | No | No | No | | 03/2021 |
| [Server4You](https://www.server4you.de)| AS131914 | No | No | No | - | 03/2021 |
-| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good dedicated root servers for a good price. Unmetered bandwidth on dedicated servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to a server lock" | 09/27/2021 |
+| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good dedicated root servers for a good price. Unmetered bandwidth on dedicated servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to a server lock" Locations: DE,FI | 09/27/2021 |
| [Contabo](https://contabo.de) | AS51167 | No | No | No | Tor prohibited due to terms of service | 03/2021 |
| [Strato](https://strato.de) | AS6724 | No | No | No | - | 03/2021 |
| [PraHost](https://www.prahost.com) | - | Yes | Yes | Yes | "If there is any abuse notice received, you need to solve it in given time, else your IP will be blocked until you take any action" | 03/2021 |
@@ -313,9 +315,10 @@ For network diversity and stronger anonymity, you should avoid providers and cou
| [HostHatch](https://hosthatch.com) | AS46562 | Yes | Yes | No | Their vps isp are mixed include: QuadraNet, nLayer, AboveNet, Inteliquent, Atrato Networks and open peering with the entire Any2LA and Atlanta TIE networks. | 05/01/16 |
| [HostUS](http://hostus.us/) | AS25926 | Yes | Yes | No | - | 10/16/14 |
| [IPXcore](https://ipxcore.com/) | - | Yes | Yes | No | - | - |
-| [Linode](https://www.linode.com/) | AS63949 | Yes | Yes | Yes | "We allow Tor exits as long as they have a reduced exit policy." - I've used 10TB this month in total for all 3 of my exit nodes spread out in different locations. I've recieved 0 notices from Linode while using the free 100$ credits you get. I allow ports 53,80,443. My DE exit node is now the [2nd fastest](https://i.imgur.com/Owj6HkD.png) Linode relay, with UK third. I would recommend this host to use the free credits, but wouldn't really recommend paying as bandwidth is limited. | 10/07/2021 |
+| [Linode](https://www.linode.com/) | AS63949 | Yes | Yes | Yes | "We allow Tor exits as long as they have a reduced exit policy." - I've used 10TB this month in total for all 3 of my exit nodes spread out in different locations. I've recieved 0 notices from Linode while using the free 100$ credits you get. I allow ports 53,80,443. My DE exit node is now the [2nd fastest](https://i.imgur.com/Owj6HkD.png) Linode relay, with UK third. I would recommend this host to use the free credits, but wouldn't really recommend paying as bandwidth is limited. Locations: US,CA,GB,DE,SG,JP,IN,AU | 10/07/2021 |
| [Luna Node](https://www.lunanode.com/index.php) | - | Yes | Yes | No | - | 05/01/14 |
-| [OVH](https://www.ovh.com/us/index.xml) | AS16276 | Yes | Yes | No | Unmetered bandwidth in non asia locations. - "I will gladly explain this situation for you. Running a Tor exit node is strictly forbidden and can lead to the suspension and even termination of your server and account." | 09/27/2021 |
+| [Oracle Cloud](https://www.oracle.com/cloud/free/) | AS31898 | Yes | Yes | No | Offers generous free tier - 10TB free outbound bandwidth, I have ran a non exit relay for a few months with no problems, [as well as others](https://metrics.torproject.org/rs.html#search/as:AS31898). Note that they will terminate your account if you're suspicious and not provide reason, even on support chat, I've gotten an account banned simply for running a smokeping instance. (Pinging ip addresses to test network stability). Locations: US,CA,GB,DE,CH,NL,SA,UAE,BR,CL,JP,KR,AU,IN | 10/10/2021 |
+| [OVH](https://www.ovh.com/us/index.xml) | AS16276 | Yes | Yes | No | Unmetered bandwidth in non asia locations. - "I will gladly explain this situation for you. Running a Tor exit node is strictly forbidden and can lead to the suspension and even termination of your server and account." Locations: US,CA,FR,DE,PL,GB,SG | 09/27/2021 |
| [Oplink.net](https://www.oplink.net) | - | Yes | Yes | No | - | 09/03/15 |
| [Psychz.net](https://www.psychz.net/) | - | Yes | Yes | Yes | Very Exit friendly. Standard Tor response will resolve abuse issues. | 10/07/15 |
| [PulseServers](https://www.pulseservers.com) | AS16276 | Yes | Yes | Yes | Exit-friendly. | 05/01/16 |
diff --git a/content/relay/setup/guard/centos-rhel/contents.lr b/content/relay/setup/guard/centos-rhel/contents.lr
new file mode 100644
index 0000000..fc5b7d8
--- /dev/null
+++ b/content/relay/setup/guard/centos-rhel/contents.lr
@@ -0,0 +1,95 @@
+_model: page
+---
+color: primary
+---
+title: CentOS/RHEL
+---
+body:
+
+### 1. Enable Automatic Software Updates
+
+One of the most important 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 `epel-release`
+
+To install `tor` package on CentOS/RHEL, you need to install the [EPEL](https://fedoraproject.org/wiki/EPEL) repository first:
+
+```
+# yum install epel-release
+```
+
+Recent versions of CentOS/RHEL are using `dnf` instead of `yum`:
+
+```
+# dnf install epel-release
+```
+
+If you are on a recent version that uses `dnf`, please keep using it for the following steps where `yum` is called on this setup guide.
+
+### 3. Configure Tor Project's Repository
+
+Configuring the Tor Project's Repository for CentOS/RHEL consists basically on setting up `/etc/yum.repos.d/Tor.repo` with the following content:
+
+```
+[tor]
+name=Tor for Enterprise Linux $releasever - $basearch
+baseurl=https://rpm.torproject.org/centos/$releasever/$basearch
+enabled=1
+gpgcheck=1
+gpgkey=https://rpm.torproject.org/centos/public_gpg.key
+cost=100
+```
+
+More information about it can be found [here](https://support.torproject.org/rpm/).
+
+### 4. Package installation
+
+Once you are set with EPEL and the Tor repositories, you are now able to install the package:
+
+```
+# yum install tor
+```
+
+Please note that when you are installing the first package from the EPEL repository you will be asked about verifying the EPEL's GPG signing key. Please ensure the key matches with the one available on the [Fedora Project website](https://getfedora.org/keys/). This will also happens when installing packages from Tor's repository for the first time - again you must ensure the key matches.
+
+### 5. Configuration file
+
+Put the configuration file `/etc/tor/torrc` in place:
+
+```
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
+ExitRelay 0
+SocksPort 0
+```
+
+### 6. Enable and Start `tor`
+
+Recent versions os CentOS/RHEL which ship with systemd:
+
+```
+# systemctl enable --now tor
+```
+
+Should you use an older release like CentOS/RHEL 6, that will be:
+
+```
+# service tor enable
+# service tor start
+```
+
+### 7. Final Notes
+
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
+---
+html: two-columns-page.html
+---
+key: 1
+---
+section: Middle/Guard relay
+---
+section_id: relay-operations
+---
+subtitle: How to deploy a middle/Guard relay on CentOS/RHEL
diff --git a/content/relay/setup/guard/centos-rhel/updates/contents.lr b/content/relay/setup/guard/centos-rhel/updates/contents.lr
new file mode 100644
index 0000000..7f67dcc
--- /dev/null
+++ b/content/relay/setup/guard/centos-rhel/updates/contents.lr
@@ -0,0 +1,94 @@
+_model: page
+---
+color: primary
+---
+title: RPM Distributions
+---
+body:
+
+# CentOS and RHEL 8 or later versions
+
+For CentOS and RHEL 8 or later versions, the dnf-automatic package is the preferred approach:
+
+```
+dnf install dnf-automatic
+```
+
+In /etc/dnf/automatic.conf set:
+
+```
+download_updates = yes
+apply_updates = yes
+```
+
+Enable and start automatic updates via:
+
+```
+systemctl enable --now dnf-automatic.timer
+```
+
+Check status of dnf-automatic:
+```
+systemctl list-timers *dnf-*
+```
+
+# CentOS and RHEL 7 or earlier versions
+
+For CentOS and RHEL 7 or earlier versions, the yum-cron package is the preferred approach:
+
+```
+yum install yum-cron
+```
+
+In /etc/yum/yum-cron.conf set:
+
+```
+download_updates = yes
+apply_updates = yes
+```
+
+Enable and start automatic updates via:
+
+```
+systemctl start yum-cron.service
+```
+
+# openSUSE
+
+First, you need to install the automatic update package
+
+```
+zypper install yast2-online-update-configuration
+```
+
+Then start the configuration tool (ncurses based) with:
+
+```
+yast2 online_update_configuration
+```
+
+Enable the following settings:
+
+```
+ Automatic Online Update
+ Interval: Daily
+ Skip Interactive Patches
+ Agree with Licenses
+ Use delta rpms
+```
+
+Confirm your configuration with OK.
+
+The official openSUSE documentation can be found [here](https://doc.opensuse.org/documentation/leap/startup/single-html/book.opensuse.startup/index.html#sec-onlineupdate-you-automatically).
+---
+html: two-columns-page.html
+---
+key: 1
+---
+section: Automatic Updates
+---
+section_id: automatic-updates
+---
+_slug: updates
+---
+_discoverable: no
diff --git a/content/relay/setup/guard/debian-ubuntu/contents.lr b/content/relay/setup/guard/debian-ubuntu/contents.lr
new file mode 100644
index 0000000..95f9eef
--- /dev/null
+++ b/content/relay/setup/guard/debian-ubuntu/contents.lr
@@ -0,0 +1,62 @@
+_model: page
+---
+color: primary
+---
+title: Debian/Ubuntu
+---
+body:
+
+### 1. Enable Automatic Software Updates
+
+One of the most important 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 Project's Repository
+
+Configuring the Tor Project's package repository for Debian/Ubuntu is documented **[here](https://support.torproject.org/apt/tor-deb-repo/)**. Please follow those instructions before proceeding.
+
+### 3. Package installation
+
+Ensure you update the packages database before installing the package, than call `apt` to install it:
+
+```
+# apt update
+# apt install tor
+```
+
+### 4. Configuration file
+
+Put the configuration file `/etc/tor/torrc` in place
+
+```
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
+ExitRelay 0
+SocksPort 0
+```
+
+### 5. Restart the service
+
+Restart the `tor` daemon, so your configuration changes take effect:
+
+```
+# systemctl restart tor at default
+```
+
+### 6. Final Notes
+
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
+---
+html: two-columns-page.html
+---
+key: 2
+---
+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/setup/guard/debian-ubuntu/updates/contents.lr b/content/relay/setup/guard/debian-ubuntu/updates/contents.lr
new file mode 100644
index 0000000..34bda83
--- /dev/null
+++ b/content/relay/setup/guard/debian-ubuntu/updates/contents.lr
@@ -0,0 +1,63 @@
+_model: page
+---
+color: primary
+---
+title: Debian and Ubuntu
+---
+_discoverable: no
+---
+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";
+```
+
+Update 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: Automatic Updates
+---
+section_id: automatic-updates
+---
+_slug: updates
diff --git a/content/relay/setup/guard/dragonflybsd/contents.lr b/content/relay/setup/guard/dragonflybsd/contents.lr
index f5e9c39..1b0c979 100644
--- a/content/relay/setup/guard/dragonflybsd/contents.lr
+++ b/content/relay/setup/guard/dragonflybsd/contents.lr
@@ -2,33 +2,34 @@ _model: page
---
color: primary
---
-title: DragonflyBSD
+title: DragonFlyBSD
---
body:
-# 1. Bootstrap `pkg`
+### 1. Enable Automatic Software Updates
-DragonFlyBSD's daily snapshots and releases (starting with 3.4) come with `pkg` already installed.
-Upgrades from earlier releases, however, will not have it.
+One of the most important 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 for your operating system.
-If `pkg` is missing on the system for any reason, it can be quickly bootstrapped without having to build it from source or even having **DPorts** installed:
+### 2. Bootstrap `pkg`
+
+DragonFlyBSD's daily snapshots and releases (starting with 3.4) come with `pkg` already installed. Upgrades from earlier releases, however, will not have it. If `pkg` is missing on the system for any reason, it can be quickly bootstrapped without having to build it from source or even having **DPorts** installed:
```
-cd /usr
-make pkg-bootstrap
-rehash
-pkg-static install -y pkg
-rehash
+# cd /usr
+# make pkg-bootstrap
+# rehash
+# pkg-static install -y pkg
+# rehash
```
-### 1.1. Recommended Steps to Setup `pkg`
+#### 2.1. Recommended Steps to Setup `pkg`
Here, it will be similar to what we have on a **FreeBSD** system, and we are going to use HTTPS to fetch our packages, and updates - so here we also need an extra package to help us out (ca_root_nss).
Installing the `ca_root_nss` package:
```
-pkg install ca_root_nss
+# pkg install ca_root_nss
```
For fresh installations, the file `/usr/local/etc/pkg/repos/df-latest.conf.sample` is copied to `/usr/local/etc/pkg/repos/df-latest`. The files ending in the ".sample" extension are ignored; pkg(8) only reads files that end in ".conf" and it will read as many as it finds.
@@ -43,53 +44,49 @@ We can simply edit the **URL** used to point out the repositories on `/usr/local
After applying all these changes, we update the packages list again and try to check if there's already a new update to apply:
```
-pkg update -f
-pkg upgrade -y -f
+# pkg update -f
+# pkg upgrade -y -f
```
-# 2. Package Installation
+### 3. Package installation
Install the `tor` package:
```
-pkg install tor
+# pkg install tor
```
... or install an alpha release:
```
-pkg install tor-devel
+# pkg install tor-devel
```
-# 3. Configuration File
-
-Put the configuration file `/usr/local/etc/tor/torrc` in place:
+### 4. Configuration file
+Put the configuration file `/usr/local/etc/tor/torrc` in place
```
-#change the nickname "myBSDrelay" to a name that you like
-Nickname myBSDRelay
-# You might want to use/try a different port, should you want to
-ORPort 443
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
ExitRelay 0
SocksPort 0
Log notice syslog
-# Change the email address below and be aware that it will be published
-ContactInfo tor-operator at your-emailaddress-domain
```
-# 4. Start the service
+### 5. Start the service
Here we set `tor` to start at boot time and use the setuid feature, in order to bind to lower ports like 443 (the daemon itself will still run as a regular non-privileged user).
```
-echo "tor_setuid=YES" >> /etc/rc.conf
-echo "tor_enable=YES" >> /etc/rc.conf
-service tor start
+# echo "tor_setuid=YES" >> /etc/rc.conf
+# echo "tor_enable=YES" >> /etc/rc.conf
+# service tor start
```
-# 5. Final Notes
+### 6. Final Notes
If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
@@ -102,4 +99,4 @@ section: Middle/Guard relay
---
section_id: relay-operations
---
-subtitle: How to deploy a Middle/Guard relay on DragonflyBSD
+subtitle: How to deploy a Middle/Guard relay on DragonFlyBSD
diff --git a/content/relay/setup/guard/fedora/contents.lr b/content/relay/setup/guard/fedora/contents.lr
index 997ed43..26a016b 100644
--- a/content/relay/setup/guard/fedora/contents.lr
+++ b/content/relay/setup/guard/fedora/contents.lr
@@ -6,11 +6,13 @@ title: Fedora
---
body:
-# 1. Enable Automatic Software Updates
+### 1. Enable Automatic Software Updates
One of the most important 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. Add the following to `/etc/yum.repos.d/tor.repo` and then install the tor package.
+### 2. Configure Tor Project's Repository
+
+Configuring the Tor Project's Repository for Fedora consists basically on setting up `/etc/yum.repos.d/Tor.repo` with the following content:
```
[tor]
@@ -22,30 +24,35 @@ gpgkey=https://rpm.torproject.org/fedora/public_gpg.key
cost=100
```
-`sudo dnf install tor`
+More information about it can be found [here](https://support.torproject.org/rpm/).
+
+### 3. Package installation
+
+Install the `tor` package:
+```
+# dnf install tor
+```
-# 3. Configuration File
+### 4. Configuration file
Put the configuration file `/etc/tor/torrc` in place:
```
-#change the nickname "myNiceRelay" to a name that you like
-Nickname myNiceRelay
-ORPort 9001
-ExitRelay 0
-# Change the email address below and be aware that it will be published
-ContactInfo tor-operator at your-emailaddress-domain
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
+ExitRelay 0
+SocksPort 0
```
-# 4. Start the tor daemon and make sure it starts at boot
+# 5. Start the service
```
-systemctl enable tor
-systemctl start tor
+# systemctl enable --now tor
```
-# 5. Final notes
+# 6. Final Notes
If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
diff --git a/content/relay/setup/guard/freebsd/contents.lr b/content/relay/setup/guard/freebsd/contents.lr
index 97b70a4..9d05331 100644
--- a/content/relay/setup/guard/freebsd/contents.lr
+++ b/content/relay/setup/guard/freebsd/contents.lr
@@ -6,23 +6,23 @@ title: FreeBSD
---
body:
-# 1. Enable Automatic Updates for Packages
+### 1. Enable Automatic Software Updates
One of the most important 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. Bootstrap `pkg`
+### 2. Bootstrap `pkg`
-This article assumes we have already a base installation of FreeBSD running, and only the base system (here, we are running 12.0-RELEASE).
+This article assumes we have already a base installation of FreeBSD running, and only the base system (here, we are running 12.2-RELEASE).
That means we do not have any packages installed, or even the `pkg` packages manager itself (there's no `sudo` available - we are running commands as root).
To bootstrap and install `pkg` we should run the following command:
```
-pkg bootstrap
-pkg update -f
+# pkg bootstrap
+# pkg update -f
```
-### 2.1. Recommended Steps to Setup `pkg`
+#### 2.1. Recommended Steps to Setup `pkg`
To follow upstream updates in a "faster way" we recommend changing the 'quarterly' branch used by `pkg` to its 'latest' branch.
@@ -31,7 +31,7 @@ One additional step is to prefer using HTTPS to fetch our packages, and updates
Installing the `ca_root_nss` package:
```
-pkg install ca_root_nss
+# pkg install ca_root_nss
```
We are keeping the original setting used by `pkg` but setting a new one that will override it.
@@ -41,7 +41,7 @@ This configuration file will be `/usr/local/etc/pkg/repos/FreeBSD.conf`.
Creating the new directory:
```
-mkdir -p /usr/local/etc/pkg/repos
+# mkdir -p /usr/local/etc/pkg/repos
```
This is how the new configuration file `/usr/local/etc/pkg/repos/FreeBSD.conf` must look like:
@@ -55,56 +55,57 @@ FreeBSD: {
After applying all these changes, we update the packages list again and try to check if there's already a new update to apply:
```
-pkg update -f
-pkg upgrade -y -f
+# pkg update -f
+# pkg upgrade -y -f
```
-# 3. Install `tor` FreeBSD's Package
+### 3. Package installation
+Install `tor` FreeBSD's package.
Here we can choose to install the latest stable version, like:
```
-pkg install tor
+# pkg install tor
```
... or install an alpha release:
```
-pkg install tor-devel
+# pkg install tor-devel
```
-# 4. Configure `/usr/local/etc/tor/torrc`
+### 4. Configuration file
-This is a very simple version of the `torrc` configuration file in order to run a Middle/Guard relay on the Tor network:
+Put the configuration file `/usr/local/etc/tor/torrc` in place:
```
-Nickname myBSDRelay # Change your relay's nickname to something you like
-ContactInfo your at email # Please write your email address and be aware that it will be published
-ORPort 443 # You might want to use/try a different port, should you want to
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
ExitRelay 0
SocksPort 0
Log notice syslog
```
-# 5. Ensure `net.inet.ip.random_id` is enabled:
+### 5. Enable `net.inet.ip.random_id`
```
-echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
-sysctl net.inet.ip.random_id=1
+# echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
+# sysctl net.inet.ip.random_id=1
```
-# 6. Start `tor`:
+### 6. Start the service
Here we set `tor` to start at boot time and use the setuid feature, in order to bind to lower ports like 443 (the daemon itself will still run as a regular non-privileged user).
```
-sysrc tor_setuid=YES
-sysrc tor_enable=YES
-service tor start
+# sysrc tor_setuid=YES
+# sysrc tor_enable=YES
+# service tor start
```
-# 7. Final Notes
+### 7. Final Notes
If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
diff --git a/content/relay/setup/guard/netbsd/contents.lr b/content/relay/setup/guard/netbsd/contents.lr
index 48a1ec7..199f6b2 100644
--- a/content/relay/setup/guard/netbsd/contents.lr
+++ b/content/relay/setup/guard/netbsd/contents.lr
@@ -6,39 +6,53 @@ title: NetBSD
---
body:
-# 1. Setup `pkg_add`
+### 1. Enable Automatic Software Updates
+
+One of the most important 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 for your operating system.
+
+### 2. Setup `pkg_add`
+
+Modern versions of the NetBSD operating system can be set to use `pkgin`, which is a piece of software aimed to be like `apt` or `yum` for managing pkgsrc binary packages. We are not convering its setup here, and opt to use plain `pkg_add` instead.
```
-echo "PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/$(uname -r)/All" > /etc/pkg_install.conf
+# echo "PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/$(uname -r)/All" > /etc/pkg_install.conf
```
-# 2. Install `tor` NetBSD's package
+### 3. Package installation
+
+Install `tor` NetBSD's package:
```
-pkg_add tor
+# pkg_add tor
```
-# 3. Configure `/usr/pkg/etc/tor/torrc`
+### 4. Configuration file
+
+Put the configuration file `/usr/pkg/etc/tor/torrc` in place:
```
-Nickname myBSDRelay # Change your relay's nickname to something you like
-ContactInfo your at email # Please write your email address and be aware that it will be published
-ORPort 443 # You might want to use/try a different port, should you want to
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
ExitRelay 0
SocksPort 0
Log notice syslog
```
-# 6. Start `tor`:
+### 5. Start the service
Here we set `tor` to start during boot and call it for the first time:
```
-ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor
-echo "tor=YES" >> /etc/rc.conf
-/etc/rc.d/tor start
+# ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor
+# echo "tor=YES" >> /etc/rc.conf
+# /etc/rc.d/tor start
```
+### 6. Final Notes
+
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+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/setup/guard/openbsd/contents.lr b/content/relay/setup/guard/openbsd/contents.lr
index 232a2fe..22bd9c5 100644
--- a/content/relay/setup/guard/openbsd/contents.lr
+++ b/content/relay/setup/guard/openbsd/contents.lr
@@ -6,28 +6,32 @@ title: OpenBSD
---
body:
-# 1. Install `tor` OpenBSD's Package
+### 1. Enable Automatic Software Updates
-Recent OpenBSD systems, like 6.5/amd64, already have the repository configured on `/etc/installurl` so we do not need to bother changing it.
+One of the most important 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 for your operating system.
+
+### 2. Package installation
+
+Recent OpenBSD systems, since 6.5, already have the repository configured on `/etc/installurl` so we do not need to bother changing it.
If that's not your case, please adjust the `installurl` configuration file like this:
```
-echo "https://cdn.openbsd.org/pub/OpenBSD" > /etc/installurl
+# echo "https://cdn.openbsd.org/pub/OpenBSD" > /etc/installurl
```
Proceed with `pkg_add` to install the package:
```
-pkg_add tor
+# pkg_add tor
```
-### 2.1. Recommended Steps to Install `tor` on OpenBSD
+#### 2.1. Recommended Steps to Install `tor` on OpenBSD
If you want to install a newer version of the `tor` OpenBSD's package, you can use M:Tier's binary packages:
```
-ftp https://stable.mtier.org/openup
+# ftp https://stable.mtier.org/openup
```
Right after fetching `openup` you can run it to sync M:Tier's repository and update your packages; it's an alternative to `pkg_add -u`.
@@ -35,32 +39,35 @@ Right after fetching `openup` you can run it to sync M:Tier's repository and upd
Here is how you proceed with these steps:
```
-openup
+# ./openup
```
-# 3. Configure `/etc/tor/torrc`
+### 3. Configuration file
-This is a very simple version of the `torrc` configuration file in order to run a Middle/Guard relay on the Tor network:
+Put the configuration file `/etc/tor/torrc` in place:
```
-Nickname myBSDRelay # Change your relay's nickname to something you like
-ContactInfo your at email # Please write your email address and be aware that it will be published
-ORPort 443 # You might want to use/try a different port, should you want to
-ExitRelay 0
-SocksPort 0
-Log notice syslog
-User _tor
+Nickname myNiceRelay # Change "myNiceRelay" to something you like
+ContactInfo your at e-mail # Write your e-mail and be aware it will be published
+ORPort 443 # You might use a different port, should you want to
+ExitRelay 0
+SocksPort 0
+Log notice syslog
+DataDirectory /var/tor
+User _tor
+RunAsDaemon 1
```
-# 4. Change `openfiles-max` and `maxfiles` Tweaks
+### 4. Change `openfiles-max` and `maxfiles`
-By default, OpenBSD maintains a rather low limit on the maximum number of open files for a process. For a daemon such as Tor's, that opens a connection to each and every other relay (currently around 7000 relays), these limits should be raised.
+By default, OpenBSD maintains a rather low limit on the maximum number of open files for a process.
+For a daemon such as Tor's, that opens a connection to each and every other relay (currently around 7000 relays), these limits should be raised.
Append the following section to `/etc/login.conf`:
```
-tor:
- :openfiles-max=13500:
+tor:\
+ :openfiles-max=13500:\
:tc=daemon:
```
@@ -69,19 +76,23 @@ OpenBSD also stores a kernel-level file descriptor limit in the sysctl variable
Increase it from the default of 7030 to 16000:
```
-echo "kern.maxfiles=16000" >> /etc/sysctl.conf
-sysctl kern.maxfiles=16000
+# echo "kern.maxfiles=16000" >> /etc/sysctl.conf
+# sysctl kern.maxfiles=16000
```
-# 6. Start `tor`:
+### 5. Start the service
Here we set `tor` to start during boot and call it for the first time:
```
-rcctl enable tor
-rcctl start tor
+# rcctl enable tor
+# rcctl start tor
```
+### 6. Final Notes
+
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+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/setup/post-install/contents.lr b/content/relay/setup/post-install/contents.lr
index ccd8e8d..942d72f 100644
--- a/content/relay/setup/post-install/contents.lr
+++ b/content/relay/setup/post-install/contents.lr
@@ -120,6 +120,7 @@ Default locations of the keys folder:
* Debian/Ubuntu: `/var/lib/tor/keys`
* FreeBSD: `/var/db/tor/keys`
+* OpenBSD: `/var/tor/keys`
* Fedora: `/var/lib/tor/keys`
## Subscribe to the tor-announce mailing list
diff --git a/templates/home.html b/templates/home.html
index b81314c..f95a873 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -14,7 +14,7 @@
<h2 class="card-title ">{{ _(child.title) }}</h2>
<p class="card-text">{{ _(child.subtitle) }}</p>
<div class="illo-container">
- <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ _(child.section) }}" />
+ <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(child.section) }}" />
</div>
</div>
<a href="{{ child.path|url }}" class="btn btn-primary">{{ _(child.cta) }}</a>
diff --git a/templates/homepage.html b/templates/homepage.html
index 361ac35..99f38a1 100644
--- a/templates/homepage.html
+++ b/templates/homepage.html
@@ -22,9 +22,7 @@
</div>
<div class="container">
<div class="row p-5 m-3 border {{ locale.direction }}">
- <p>
- {{ _('The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate.') }} Read our <a href="https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt" title="Code of Conduct" target="_blank">Code of Conduct</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/social_contract.txt" title="Social Contract" target="_blank">Social Contract</a>, <a href="https://gitweb.torproject.org/community/policies.git/tree/statement_of_values.txt" title="Statement of Values" target="_blank">Statement of Values</a> and learn about the <a href="https://gitweb.torproject.org/community/policies.git/tree/community_council.txt" title="Tor Commmunity Council" target="_blank">Tor Community Council</a>.
- </p>
+ {{ md(_('The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. Read our [Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt "Code of Conduct"), [Social Contract](https://gitweb.torproject.org/community/policies.git/tree/social_contract.txt "Social Contract"), [Statement of Values](https://gitweb.torproject.org/community/policies.git/tree/statement_of_values.txt "Statement of Values"), and learn about the [Tor Community Council](https://gitweb.torproject.org/community/policies.git/tree/community_council.txt "Tor Community Council").')) }}
</div>
</div>
<footer>
diff --git a/templates/localization.html b/templates/localization.html
index 7a17aba..1d0056b 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -4,7 +4,7 @@
{{ this.body }}
</div>
<div class="col-lg-5">
- <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
+ <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(this.section_id) }}" />
</div>
</div>
<div class="row">
@@ -29,7 +29,7 @@
{{ _('Localization is a continuous process across our applications. Notice any improvements we could make to our translations? Open a ticket, reach out to us, or become part of our translators squad.') }}
</p>
<a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n">
- {{ _('Translators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ {{ _('Join Tor Translators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
</a>
</div>
</div>
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index d71e970..0f48cfd 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -25,9 +25,9 @@
<div class="card mt-5">
<ul class="list-group list-group-flush">
- <!--li class="list-group-item"><a><span class="card-text text-muted">{{ _("Contributors to this page:") }} <a href="#" title="#">cypherpunk</a></span></li-->
+ <!--li class="list-group-item"><a><span class="card-text text-muted">Contributors to this page: <a href="#" title="#">cypherpunk</a></span></li-->
<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>
+ <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>
diff --git a/templates/user-research.html b/templates/user-research.html
index 339cca3..903831a 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -4,7 +4,7 @@
{{ this.body }}
</div>
<div class="col-lg-5">
- <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
+ <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(this.section) }}" />
</div>
</div>
<div class="row">
More information about the tor-commits
mailing list