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

[community/staging] part of https://dip.torproject.org/web/support/issues/39
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit ee0a98ffd2ec3b2cdfd22d1abab043993835e47d Merge: 07d01f8 341445d Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:22:52 2019 +0200 part of https://dip.torproject.org/web/support/issues/39 close: https://github.com/torproject/community/pull/11 content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[community/staging] Add .github/FUNDING.yml
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 129cb7e830104d0638efd535179f9d5059ef2fcd Author: hiro <hiro(a)torproject.org> Date: Thu Sep 12 15:40:18 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org']

1 0

[community/staging] Fix OpenBSD tor bridge instructions (data dir + logging perms)
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit bbcb1574fb69804863d33ac96129965269cedc21 Author: Nick Gnazzo <nickgnazzo(a)icloud.com> Date: Thu Sep 12 10:48:39 2019 -0400 Fix OpenBSD tor bridge instructions (data dir + logging perms) --- .../technical-setup/bridge/openbsd/contents.lr | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 50d1a26..55b8f60 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -49,19 +49,27 @@ Nickname PickANickname Log notice file /var/log/tor/notices.log User _tor +DataDirectory /var/tor ``` Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. * 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. -### 3. Start the tor daemon and make sure it starts at boot: +### 3. Create the tor log directory and give it the correct permissions: + +``` +mkdir /var/log/tor +chown _tor /var/log/tor +``` + +### 4. Start the tor daemon and make sure it starts at boot: ``` rcctl enable tor rcctl start tor ``` -### 4. Monitor your logs +### 5. Monitor your logs To confirm your bridge is running with no issues, you should see something like this (`/var/log/tor/notices.log`): @@ -75,7 +83,7 @@ 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. ``` -### 5. Final notes +### 6. Final notes If you are having troubles setting up your bridge, have a look at [our help section](https://community.torproject.org/relay/getting-help/). If

1 0

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

21 Mar '21

commit 47d28249f91db8816f515fa217a836945158d846 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 12 22:21:29 2019 +0200 Remove locales --- community.lektorproject | 30 ------------------------------ databags/alternatives.ini | 36 ------------------------------------ 2 files changed, 66 deletions(-) diff --git a/community.lektorproject b/community.lektorproject index 7195f39..e75ff45 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -9,33 +9,3 @@ name = English (en) primary = yes url_prefix = / locale = en - -[alternatives.de] -name = Deutsch (de) -url_prefix = /de/ -locale = de - -[alternatives.es] -name = Español -url_prefix = /es/ -locale = es - -[alternatives.fr] -name = Français -url_prefix = /fr/ -locale = fr - -[alternatives.it] -name = Italia (it) -url_prefix = /it/ -locale = it - -[alternatives.pt-BR] -name = Português Br. (pr-BR) -url_prefix = /pt-BR/ -locale = pt-BR - -[alternatives.ru] -name = Русский (ru) -url_prefix = /ru/ -locale = ru diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 1dafc16..5ac0263 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -3,39 +3,3 @@ direction = text-left order = order-last url = / language = English (en) - -[de] -direction = text-left -order = order-last -url = /de/ -language = Deutsch (de) - -[es] -direction = text-left -order = order-last -url = /es/ -language = Español (es) - -[fr] -direction = text-left -order = order-last -url = /fr/ -language = Français (fr) - -[it] -direction = text-left -order = order-last -url = /it/ -language = Italiano (it) - -[pt-BR] -direction = text-left -order = order-last -url = /pt-BR/ -language = Português Br. (pt-BR) - -[ru] -direction = text-left -order = order-last -url = /ru/ -language = Русский (ru)

1 0

[community/staging] Merge remote-tracking branch 'nick/master'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 80c7169ad5bfa08b45e27a2c5bdf3f92d2cc5bb3 Merge: 315fcc6 fd08625 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Sep 17 09:13:06 2019 -0700 Merge remote-tracking branch 'nick/master' .../technical-setup/bridge/openbsd/contents.lr | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

1 0

[community/staging] Update Docker container version to 0.2.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 315fcc6bd4d2b6607d8a8b441ddd8036411af110 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/staging] Fix breadcrumbs
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit ecdb5013c3030e20b79d9509e07980e6afe800cb 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 ++ lego | 2 +- templates/breadcrumb.html | 1 + templates/macros/parent.html | 1 + templates/macros/resources.html | 9 +-------- templates/two-columns-page.html | 1 + 6 files changed, 7 insertions(+), 9 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/lego b/lego index 3d80025..8cb5f20 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 +Subproject commit 8cb5f20089a163b0a5134d841248778cb518bdf2 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/staging] Update contents.lr
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 38a82c3584bb62d9a63c984bfc26575e8aea6d7e 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/staging] Update README with our workflow
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 10d21d7d6bba9b919b2baf84e3d86e8f2c0e609f Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Sep 18 22:03:33 2019 +0200 Update README with our workflow --- README.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/README.md b/README.md index d543c35..cf1d9de 100644 --- a/README.md +++ b/README.md @@ -61,3 +61,38 @@ To help us to translate, please join the Tor Project team in [Transifex](https:/ ### Getting help If you want to contribute to the Community portal, we will be happy to help you. Join us at #tor-www in [irc.oftc.net](https://www.oftc.net). + +## Our Workflows + +### Internal Workflow + +This is the workflow that Tor Internal people should use when making changes on the Community Portal: + +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +2. To view your changes on the website, you can either run lektor locally, or push to `develop` branch. +3. Once you are happy with your work, push your changes to `staging` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) +4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: + - Location of page on lektor staging, e.g https://lektor-staging.torproject.org/community/staging/ + - Contents file, on your branch, containing your changes, e.g https://dip.torproject.org/pili/community/blob/master/content/onion-service… + - For the review workflow, please see +5. Once the work has been reviewed and any necessary changes have been made, reviewer should move the issue to the `reviewed` column and add a comment to the issue with details of where the latest version can be found, e.g https://dip.torproject.org/{user}/community/blob/master/content/onion-servi… +6. Team members with write access to gitweb master will then push these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… +7. Merger should then move the the ticket to the `Closed` column + +### Volunteer Workflow + +This is the workflow that external volunteers should use when making changes on the Community Portal: + +We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: + +0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before +1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for reviewx + +At this point, one of us on the website team will aim to review your PR within 24h during the week (this may take longer on the weekends). Review will involve: + + - Reading the text to make sure it's accurate and there are no spelling errors or grammar mistakes + - If there are any front end and/or template changes involved, the changes will be pushed to our development branch for functionality review + - If there are any fixes necessary, we will ask for changes to be made. + +Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. +

1 0

[community/staging] trailing space
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 6c4d1aba92d23a88ee60bca1490954bed1206203 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Sep 19 18:49:39 2019 +0200 trailing space --- content/onion-services/overview/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index 869db5e..c85306f 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -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 privacy and security benefits to their users. +Onion services offer various privacy and security benefits to their users. ### Location hiding

1 0