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

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 28 Apr '19

28 Apr '19

commit e1e58bf437cd20708434cf81565e287a3d12cde2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 28 05:47:48 2019 +0000 Update translations for tbmanual-contentspot --- contents+tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 343fe078d..e79393567 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1022,7 +1022,7 @@ msgstr "" "farklı olarak, profil oluşturma saldırılarını önlemek için yalnız 2-3 ayda " "bir değiştirilir. Koruyucular hakkında ayrıntılı bilgi almak için, <a " "href=\"https://www.torproject.org/docs/faq#EntryGuards\">SSS</a> ve <a " -"href=\"https://support.torproject.org/tbb/tbb-2/\">Destek Portalı</a> " +"href=\"https://support.torproject.org/tbb/tbb-2/\">Destek Sitesi</a> " "bölümlerine bakabilirsiniz." #: https//tb-manual.torproject.org/en-US/managing-identities/ @@ -1259,10 +1259,10 @@ msgid "" "and a padlock." msgstr "" "Onion hizmeti kullanan bir web sitesine erişirken, Tor Browser adres " -"çubuğunda bağlantınızın durumunun güvenli olduğunu ve bir onion hizmeti " -"kullanıldığını belirten küçük yeşil bir soğan simgesi görüntülenir. Https " -"üzerinden bir onion hizmetine erişiyorsanız yeşil bir soğan simgesi ile " -"kilit simgesi de görüntülenir." +"çubuğunda bağlantınızın durumunun güvenli olduğunu ve bir onion hizmetinin " +"kullanıldığını belirten bir yeşil soğan simgesi görüntülenir. Onion " +"hizmetine erişirken https kullanılıyorsa, üzerinde kilit olan bir yeşil " +"soğan simgesi görüntülenir." #: https//tb-manual.torproject.org/en-US/onion-services/ #: (content/onion-services/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 28 Apr '19

28 Apr '19

commit 3b42d133b53b0bfd7dba9a16d02ae7d0d079867e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 28 05:17:51 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+zh-CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index db3a0b872..9dea2ffc9 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -118,7 +118,7 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <a href" "=\"/managing-identities/#new-identity\">New Identity</a> is requested)." msgstr "" -"* 默认情况下，Tor 浏览器不保存任何浏览记录。Cookie 仅在单次会话中有效（到 Tor 浏览器退出或者需要 <a href" +"* 默认情况下，Tor 浏览器不保存任何浏览记录。Cookie 仅在单次会话中有效（到 Tor 浏览器退出或者在请求 <a href" "=\"/managing-identities#new-identity\">新身份</a> 时失效）。" #: https//tb-manual.torproject.org/en-US/about/

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 28 Apr '19

28 Apr '19

commit 94585775ecb47f3fb56b2d52ee2dcdc9920fdc86 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 28 05:17:44 2019 +0000 Update translations for tbmanual-contentspot --- contents+zh-CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index db3a0b872..9dea2ffc9 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -118,7 +118,7 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <a href" "=\"/managing-identities/#new-identity\">New Identity</a> is requested)." msgstr "" -"* 默认情况下，Tor 浏览器不保存任何浏览记录。Cookie 仅在单次会话中有效（到 Tor 浏览器退出或者需要 <a href" +"* 默认情况下，Tor 浏览器不保存任何浏览记录。Cookie 仅在单次会话中有效（到 Tor 浏览器退出或者在请求 <a href" "=\"/managing-identities#new-identity\">新身份</a> 时失效）。" #: https//tb-manual.torproject.org/en-US/about/

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 28 Apr '19

28 Apr '19

commit d94f9220ef29b687999db12c25f789c533f8ea15 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 28 04:47:54 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+zh-CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 48ac8975c..db3a0b872 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3,6 +3,7 @@ # ef082130671b50894cb0f0340a268c8b, 2019 # Emma Peel, 2019 # Yikai Yang <ff98sha(a)gmail.com>, 2019 +# MD Rights <psychi2009(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Yikai Yang <ff98sha(a)gmail.com>, 2019\n" +"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +52,7 @@ msgstr "博客" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Newsletter" -msgstr "新闻" +msgstr "新闻通讯" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body)

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 28 Apr '19

28 Apr '19

commit 828ebd040ea6d08e884026b4f1274d2d397adc28 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 28 04:47:46 2019 +0000 Update translations for tbmanual-contentspot --- contents+zh-CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 48ac8975c..db3a0b872 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -3,6 +3,7 @@ # ef082130671b50894cb0f0340a268c8b, 2019 # Emma Peel, 2019 # Yikai Yang <ff98sha(a)gmail.com>, 2019 +# MD Rights <psychi2009(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-09 09:20+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Yikai Yang <ff98sha(a)gmail.com>, 2019\n" +"Last-Translator: MD Rights <psychi2009(a)gmail.com>, 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +52,7 @@ msgstr "博客" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body) msgid "Newsletter" -msgstr "新闻" +msgstr "新闻通讯" #: https//tb-manual.torproject.org/en-US/menu/ #: (content/menu/contents+en-US.lrtopic.body)

1 0

[community/master] Remove 0 space character
by hiro＠torproject.org 27 Apr '19

27 Apr '19

commit 3cf1bcefaff942d56615d22898ce6bd35ca944a0 Author: hiro <hiro(a)torproject.org> Date: Sat Apr 27 21:59:21 2019 +0200 Remove 0 space character --- content/relay-operations/technical-setup/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index 4276efd..d3cd089 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -224,7 +224,7 @@ can be used to restrict bandwidth and traffic: Having a fast relay for some time of the month is preferred over a slow relay for the entire month. -Also see the bandwidth entry in the FAQ: https://www.torproject.org/docs/faq.html.en#BandwidthShaping +Also see the bandwidth entry in the FAQ: https://www.torproject.org/docs/faq.html.en#BandwidthShaping # IPv6 @@ -318,7 +318,7 @@ indications that this is a Tor exit relay. To make it even more obvious that this is a Tor exit relay you should serve a Tor exit notice HTML page. Tor can do that for you if your DirPort is on TCP -port 80, you can make use of tor's DirPortFrontPage feature to display a +port 80, you can make use of tor's DirPortFrontPage feature to display a HTML file on that port. This file will be shown to anyone directing his browser to your Tor exit relay IP address.

1 0

[community/master] Remove 0 space character
by hiro＠torproject.org 27 Apr '19

27 Apr '19

commit bfff5cde617df2280f37ba4851f6238cfa355ba6 Author: hiro <hiro(a)torproject.org> Date: Sat Apr 27 22:08:00 2019 +0200 Remove 0 space character --- content/relay-operations/technical-setup/contents.lr | 3 ++- templates/relay-operations.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index d3cd089..19d60c0 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -53,6 +53,7 @@ exit relay there) reduce the amount of abuse sent to the hoster instead of you. * Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record) This are probably things you will need to ask the hoster in a Pre-Sales ticket + # AS/location diversity When selecting your hosting provider, consider network diversity on an @@ -407,7 +408,7 @@ To avoid that the configuration gets changed (for example by the DHCP client): chattr +i /etc/resolv.conf ``` -The Debian configuration ships with QNAME minimisation (RFC7816) enabled +The Debian configuration ships with QNAME minimisation (RFC7816) enabled by default so you don't need to enable it explicitly. The unbound resolver you just installed does also DNSSEC validation. diff --git a/templates/relay-operations.html b/templates/relay-operations.html index 7fa9c8c..e861c25 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -13,7 +13,7 @@ <div class="card h-100 border-0"> <div class="card-body"> <h4 class="text-primary">.{{ child.key }}</h4> - <h4 class="card-title text-primary">{{ child.title }}</h4> + <h4 class="card-title text-primary"><a href="{{ child.path|url }}">{{ child.title }}</a></h4> <p class="card-text">{{ child.subtitle }}</p> </div> </div>

1 0

[community/master] Remove 0 space character
by hiro＠torproject.org 27 Apr '19

27 Apr '19

commit 58bc8b7d52ac57d2e942a58ea25788b7553f10be Author: hiro <hiro(a)torproject.org> Date: Sat Apr 27 21:55:03 2019 +0200 Remove 0 space character --- .../relay-operations/technical-setup/contents.lr | 317 ++++++++++----------- 1 file changed, 158 insertions(+), 159 deletions(-) diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index d7af9b1..4276efd 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -8,7 +8,7 @@ _template: layout.html --- title: Technical setup --- -subtitle: Installing and configuring your Tor relay. +subtitle: Installing and configuring your Tor relay. --- key: 3 --- @@ -18,21 +18,21 @@ body: # Considerations when choosing a hosting provider -If you have access to a high speed internet connection (>=100 Mbit/s in both -directions) and a physical piece of computer hardware, this is the best way to -run a relay. Having full control over the hardware and connection gives you a -more controllable and (if done correctly) secure environment. You can host your -own physical hardware at home (do NOT run a Tor exit relay from your home) or in -a data center. Sometimes this is referred to as installing the relay on "bare +If you have access to a high speed internet connection (>=100 Mbit/s in both +directions) and a physical piece of computer hardware, this is the best way to +run a relay. Having full control over the hardware and connection gives you a +more controllable and (if done correctly) secure environment. You can host your +own physical hardware at home (do NOT run a Tor exit relay from your home) or in +a data center. Sometimes this is referred to as installing the relay on "bare metal". -If you do not own physical hardware, you could run a relay on a rented dedicated -server or virtual private server (VPS). This can cost anywhere between -$3.00/month and thousands per month, depending on your provider, hardware -configuration, and bandwidth usage. Many VPS providers will not allow you to run -exit relays. You must follow the VPS provider's terms of service, or risk having -your account disabled. For more information on hosting providers and their -policies on allowing Tor relays, please see this list maintained by the Tor +If you do not own physical hardware, you could run a relay on a rented dedicated +server or virtual private server (VPS). This can cost anywhere between +$3.00/month and thousands per month, depending on your provider, hardware +configuration, and bandwidth usage. Many VPS providers will not allow you to run +exit relays. You must follow the VPS provider's terms of service, or risk having +your account disabled. For more information on hosting providers and their +policies on allowing Tor relays, please see this list maintained by the Tor community: [GoodBadISPs](FIXME). ## Questions to consider when choosing a hoster @@ -41,29 +41,28 @@ community: [GoodBadISPs](FIXME). * Does the hoster provide IPv6 connectivity? (it is recommended, but not required) * What virtualization / hypervisor (if any) does the provider use? (anything but OpenVZ should be fine) * Does the hoster start to throttle bandwidth after a certain amount of traffic? -* How well connected is the autonomous system of the hoster? To answer this -question you can use the AS rank of the autonomous systems if you want to +* How well connected is the autonomous system of the hoster? To answer this +question you can use the AS rank of the autonomous systems if you want to compare: http://as-rank.caida.org/ (a lower value is better) ## If you plan to run Exit Relays -* Does the hoster allow Tor exit relays? (explicitly ask them before starting an +* Does the hoster allow Tor exit relays? (explicitly ask them before starting an exit relay there) -* Does the hoster allow custom WHOIS records for your IP addresses? This helps +* Does the hoster allow custom WHOIS records for your IP addresses? This helps reduce the amount of abuse sent to the hoster instead of you. -* Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record) +* Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record) This are probably things you will need to ask the hoster in a Pre-Sales ticket - # AS/location diversity -When selecting your hosting provider, consider network diversity on an -autonomous system (AS) and country level. A more diverse network is more -resilient to attacks and outages. Sometimes it is not clear which AS you are -buying from in case of resellers. To be sure it is best to ask the hoster about +When selecting your hosting provider, consider network diversity on an +autonomous system (AS) and country level. A more diverse network is more +resilient to attacks and outages. Sometimes it is not clear which AS you are +buying from in case of resellers. To be sure it is best to ask the hoster about the AS number before ordering a server. -It is best to avoid hosters where many Tor relays are already hosted, but it is -still better to add one there than to run no relay at all. **Try to avoid** the +It is best to avoid hosters where many Tor relays are already hosted, but it is +still better to add one there than to run no relay at all. **Try to avoid** the following hoster: * OVH SAS (AS16276) @@ -71,40 +70,40 @@ following hoster: * Hetzner Online GmbH (AS24940) * DigitalOcean, LLC (AS14061) -To find out which hoster and countries are already used by many other operators +To find out which hoster and countries are already used by many other operators (that should be avoided) you can use Relay Search: -* [Autonomous System Level +* [Autonomous System Level Overview](https://metrics.torproject.org/rs.html#aggregate/as) * [Country Level Overview](https://metrics.torproject.org/rs.html#aggregate/cc) # Choosing an Operating System -We recommend you use the operating system you are most familiar with. Please -keep in mind that since most relays run on Debian and we want to avoid a +We recommend you use the operating system you are most familiar with. Please +keep in mind that since most relays run on Debian and we want to avoid a monoculture, BSD and other non-Linux based relays are greatly needed. -The following table shows the current OS distribution on the Tor network to give +The following table shows the current OS distribution on the Tor network to give you an idea of how much more non-Linux relays we should have: * https://nusenu.github.io/OrNetStats/#os-distribution-relays # OS Level Configuration -OS configuration is outside the scope of this guide but the following points are +OS configuration is outside the scope of this guide but the following points are crucial for a Tor relay, so we want to mention them here nonetheless. ## Time Synchronization (NTP) -Correct time settings are essential for Tor relays. It is recommended that you -use the network time protocol (NTP) for time synchronization and ensure your +Correct time settings are essential for Tor relays. It is recommended that you +use the network time protocol (NTP) for time synchronization and ensure your timezone is set correctly. ## 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. We collected the steps to enable automatic software updates for different +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. We collected the steps to enable automatic software updates for different operating systems: * [RPM-based distributions](FIXME) (RHEL, CentOS, Fedora, openSUSE) @@ -113,17 +112,17 @@ operating systems: # Tor Relay Setup: Installation and Configuration -This section covers the installation and configuration of the program required -to run a Tor relay for various operating systems. These steps are intended for +This section covers the installation and configuration of the program required +to run a Tor relay for various operating systems. These steps are intended for the latest stable version of the given OS, on Ubuntu for the latest LTS release. -Note: For some operating systems, there are alpha version packages available -(tor versions with new features not deemed to be stable yet). These are only -recommended for people eager to test and report bugs in bleeding edge -releases/features. If you are looking to run a relay with minimal effort we +Note: For some operating systems, there are alpha version packages available +(tor versions with new features not deemed to be stable yet). These are only +recommended for people eager to test and report bugs in bleeding edge +releases/features. If you are looking to run a relay with minimal effort we recommend you stick to stable releases. -In this guide we describe how to setup a new non-exit relay. By reading further +In this guide we describe how to setup a new non-exit relay. By reading further you can easily switch to become an exit relay. **Questions you should clarify before configuring Tor:** @@ -138,37 +137,37 @@ of the few open ports on public WIFI networks. Port 9001 is another commonly use * What email address will you use in the ContactInfo field of your relay(s)? Note: This information will be made public. * How much bandwidth/monthly traffic do you want to allow for Tor traffic? -* Does the server have an IPv6 address? +* Does the server have an IPv6 address? The installation commands are shown in code blocks and must be executed with root privileges. ## Make sure relay ports can be reached -If you are using a firewall, open a hole in your firewall so incoming -connections can reach the ports you will use for your relay (ORPort, plus -DirPort if you enabled it). Also, make sure you allow all outgoing connections -too, so your relay can reach the other Tor relays, clients and destinations. You -can find the specific ORPort TCP port number in the torrc configuration samples +If you are using a firewall, open a hole in your firewall so incoming +connections can reach the ports you will use for your relay (ORPort, plus +DirPort if you enabled it). Also, make sure you allow all outgoing connections +too, so your relay can reach the other Tor relays, clients and destinations. You +can find the specific ORPort TCP port number in the torrc configuration samples bellow (in the OS specific sections). ## Configuration Management -Tor does not scale well on multi-core machines. If you run a Tor relay on a -server with a fast Internet uplink (>200 Mbit/s) you might want to consider -running multiple Tor instances on a single server with multiple cores. Note: You +Tor does not scale well on multi-core machines. If you run a Tor relay on a +server with a fast Internet uplink (>200 Mbit/s) you might want to consider +running multiple Tor instances on a single server with multiple cores. Note: You can only run two tor instances per public IPv4 address. -If you plan to run more than a single relay, or you want to run a high capacity -relay (multiple Tor instances per server) or want to use strong security -features like [Offline Master +If you plan to run more than a single relay, or you want to run a high capacity +relay (multiple Tor instances per server) or want to use strong security +features like [Offline Master Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/Of… without performing additional steps manually, you may want to use a configuration -management for better maintainability. +management for better maintainability. -There are multiple configuration management solutions for Unix based operating +There are multiple configuration management solutions for Unix based operating systems (Ansible, Puppet, Salt, ...). -The following Ansible Role has specifically been build for Tor relay operators +The following Ansible Role has specifically been build for Tor relay operators and supports multiple operating systems: http://github.com/nusenu/ansible-relayor @@ -185,11 +184,11 @@ Please choose your platform: ## Verify that your relay works -If your logfile (syslog) contains the following entry after starting your tor +If your logfile (syslog) contains the following entry after starting your tor daemon your relay should be up and running as expected: ``` -Self-testing indicates your ORPort is reachable from the outside. Excellent. +Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` @@ -199,20 +198,20 @@ relay using your nickname or IP address. # Getting Help -If you run into problems while setting up your relay you can ask your questions +If you run into problems while setting up your relay you can ask your questions on the public tor-relays mailing list: * https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays -This is a great resource for asking (and answering) questions, and generally +This is a great resource for asking (and answering) questions, and generally getting to know other relay operators. Make sure to check out the archives! # Limiting bandwidth usage (and traffic) -Tor will not limit its bandwidth usage by default, but supports multiple ways to -restrict the used bandwidth and the amount of traffic. This can be handy if you -want to ensure that your Tor relay does not exceed a certain amount of bandwidth -or total traffic per day/week/month. The following torrc configuration options +Tor will not limit its bandwidth usage by default, but supports multiple ways to +restrict the used bandwidth and the amount of traffic. This can be handy if you +want to ensure that your Tor relay does not exceed a certain amount of bandwidth +or total traffic per day/week/month. The following torrc configuration options can be used to restrict bandwidth and traffic: * AccountingMax @@ -220,53 +219,53 @@ can be used to restrict bandwidth and traffic: * AccountingStart * BandwidthRate * BandwidthBurst -* RelayBandwidthRate +* RelayBandwidthRate -Having a fast relay for some time of the month is preferred over a slow relay +Having a fast relay for some time of the month is preferred over a slow relay for the entire month. Also see the bandwidth entry in the FAQ: https://www.torproject.org/docs/faq.html.en#BandwidthShaping # IPv6 -We encourage everyone to enable IPv6 on their relays. This is especially +We encourage everyone to enable IPv6 on their relays. This is especially valuable on exit and guard relays. -Before enabling your tor daemon to use IPv6 in addition to IPv4 you should do +Before enabling your tor daemon to use IPv6 in addition to IPv4 you should do some basic IPv6 connectivity tests. -he following command line will ping the IPv6 addresses of Tor directory +he following command line will ping the IPv6 addresses of Tor directory authorities from your server: ``` ping6 -c2 2001:858:2:2:aabb:0:563b:1526 && ping6 -c2 2620:13:4000:6000::1000:118 && ping6 -c2 2001:67c:289c::9 && ping6 -c2 2001:678:558:1000::244 && ping6 -c2 2607:8500:154::3 && ping6 -c2 2001:638:a000:4140::ffff:189 && echo OK. ``` -At the end of the output you should see "OK." if that is not the case do not -enable IPv6 in your torrc configuration file before IPv6 is indeed working. If -you enable IPv6 without working IPv6 connectivity your entire relay will not be +At the end of the output you should see "OK." if that is not the case do not +enable IPv6 in your torrc configuration file before IPv6 is indeed working. If +you enable IPv6 without working IPv6 connectivity your entire relay will not be used, regardless if IPv4 is working. -If it worked fine, make your Tor relay reachable via IPv6 by adding an +If it worked fine, make your Tor relay reachable via IPv6 by adding an additional ORPort line to your configuration (example for ORPort 9001): ``` ORPort [IPv6-address]:9001 ``` -The location of that line in the configuration file does not matter you can +The location of that line in the configuration file does not matter you can simply add it next to the first ORPort lins in your torrc file. -Note: You have to explicitly specify your IPv6 address in square brackets, you -can not tell tor to bind to any IPv6 (like you do for IPv4). If you have a -global IPv6 address you should be able to find it in the output of the following +Note: You have to explicitly specify your IPv6 address in square brackets, you +can not tell tor to bind to any IPv6 (like you do for IPv4). If you have a +global IPv6 address you should be able to find it in the output of the following command: ``` ip addr|grep inet6|grep global ``` -If you are an exit relay with IPv6 connectivity, tell your tor daemon to allow +If you are an exit relay with IPv6 connectivity, tell your tor daemon to allow exiting via IPv6 so clients can reach IPv6 destinations: ``` @@ -277,50 +276,50 @@ Note: Tor requires IPv4 connectivity, you can not run a Tor relay on IPv6-only. # Important if you run more than one Tor instance -To avoid putting Tor clients at risk when operating multiple relays you must set +To avoid putting Tor clients at risk when operating multiple relays you must set a proper [MyFamily](https://2019.www.torproject.org/docs/tor-manual.html.en#MyFamily) value and have a valid [ContactInfo](https://2019.www.torproject.org/docs/tor-manual.html.en#Contac… -in your torrc configuration. The MyFamily setting is simply telling Tor clients what Tor -relays are controlled by a single entity/operator/organization, so they don't +in your torrc configuration. The MyFamily setting is simply telling Tor clients what Tor +relays are controlled by a single entity/operator/organization, so they don't use them in multiple position in a single circuit. -If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, you +If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, you would add the following configuration to set MyFamily: ``` MyFamily AAAAAAAAAA,BBBBBBBB ``` -to both relays. To find your relays fingerprint you can look into the log files -when tor starts up or find the file named "fingerprint" in your tor +to both relays. To find your relays fingerprint you can look into the log files +when tor starts up or find the file named "fingerprint" in your tor DataDirectory. -Instead of doing so manually for big operators we recommend to automate the -MyFamily setting via a configuration management solution. Manually managing +Instead of doing so manually for big operators we recommend to automate the +MyFamily setting via a configuration management solution. Manually managing MyFamily for big relaygroups is error prone and can put Tor clients at risk. # Exit Relay Configuration -It is recommended that you setup exit relays on servers dedicated to this -purpose. It is not recommended to install Tor exit relays on servers that you -need for other services as well. Do not mix your own traffic with your exit +It is recommended that you setup exit relays on servers dedicated to this +purpose. It is not recommended to install Tor exit relays on servers that you +need for other services as well. Do not mix your own traffic with your exit relay traffic. ## Reverse DNS and WHOIS record -Before switching your relay to become an exit relay, ensure that you have set a -clear DNS reverse (PTR) record to make it clear for everyone that this is a tor +Before switching your relay to become an exit relay, ensure that you have set a +clear DNS reverse (PTR) record to make it clear for everyone that this is a tor exit relay. Something like "tor-exit" it its name is a good start. -If your provider offers it, make sure your WHOIS record contains clear +If your provider offers it, make sure your WHOIS record contains clear indications that this is a Tor exit relay. ## Exit Notice HTML page -To make it even more obvious that this is a Tor exit relay you should serve a -Tor exit notice HTML page. Tor can do that for you if your DirPort is on TCP -port 80, you can make use of tor's DirPortFrontPage feature to display a -HTML file on that port. This file will be shown to anyone directing his browser +To make it even more obvious that this is a Tor exit relay you should serve a +Tor exit notice HTML page. Tor can do that for you if your DirPort is on TCP +port 80, you can make use of tor's DirPortFrontPage feature to display a +HTML file on that port. This file will be shown to anyone directing his browser to your Tor exit relay IP address. ``` @@ -328,8 +327,8 @@ DirPort 80 DirPortFrontPage /path/to/html/file ``` -We offer a sample Tor exit notice HTML file, but you might want to adjust it to -your needs: +We offer a sample Tor exit notice HTML file, but you might want to adjust it to +your needs: https://gitweb.torproject.org/tor.git/plain/contrib/operator-tools/tor-exit… Here are some more tips for running a reliable exit relay: @@ -337,23 +336,23 @@ https://blog.torproject.org/tips-running-exit-node ## Exit Policy -Defining the [exit +Defining the [exit policy](https://www.torproject.org/docs/tor-manual.html.en#ExitPolicy) -is one of the most important parts of an exit relay configuration. The exit -policy defines which destination ports you are willing to forward. This has an -impact on the amount of abuse emails you will get (less ports means less abuse -emails, but an exit relay allowing only few ports is also less useful). If you -want to be a useful exit relay you must **at least allow destination ports 80 +is one of the most important parts of an exit relay configuration. The exit +policy defines which destination ports you are willing to forward. This has an +impact on the amount of abuse emails you will get (less ports means less abuse +emails, but an exit relay allowing only few ports is also less useful). If you +want to be a useful exit relay you must **at least allow destination ports 80 and 443**. -As a new exit relay - especially if you are new to your hoster - it is good to -start with a reduced exit policy (to reduce the amount of abuse emails) and -further open it up as you become more experienced. The reduced exit policy can -be found on the +As a new exit relay - especially if you are new to your hoster - it is good to +start with a reduced exit policy (to reduce the amount of abuse emails) and +further open it up as you become more experienced. The reduced exit policy can +be found on the [ReducedExitPolicy](https://trac.torproject.org/projects/tor/wiki/doc/Reduce… wiki page. -To become an exit relay change ExitRelay from 0 to 1 in your torrc configuration +To become an exit relay change ExitRelay from 0 to 1 in your torrc configuration file and restart the tor daemon. ``` @@ -362,8 +361,8 @@ ExitRelay 1 ## DNS on Exit Relays -Unlike other types of relays, exit relays also do DNS resolution for Tor -clients. DNS resolution on exit relays is crucial for Tor clients, it should be +Unlike other types of relays, exit relays also do DNS resolution for Tor +clients. DNS resolution on exit relays is crucial for Tor clients, it should be reliable and fast by using caching. * DNS resolution can have a significant impact on the performance and reliability your exit relay provides. Poor DNS performance will result in less traffic going through your exit relay. @@ -371,29 +370,29 @@ reliable and fast by using caching. * We recommend running a local caching and DNSSEC-validating resolver without using any forwarders (specific instructions follow bellow for each operating systems) * if you want to add a second DNS resolver as a fallback to your /etc/resolv.conf configuration, try to choose a resolver within your autonomous system and make sure it is not your first entry in that file (the first entry should be your local resolver) * if a local resolver like unbound is not an option for you try to use a resolver that your provider runs in the same autonomous system (to find out if an IP address is in the same AS as your relay, you can look it up, using for example https://bgp.he.net) -* try to avoid adding too many resolvers to your /etc/resolv.conf file to limit exposure on an AS-level (try to not use more than two entries) +* try to avoid adding too many resolvers to your /etc/resolv.conf file to limit exposure on an AS-level (try to not use more than two entries) -There are multiple options for DNS server software, unbound has become a popular -one but **feel free to use any other you are comfortable with**. When choosing your -DNS resolver software try to ensure it supports DNSSEC validation and QNAME -minimisation (RFC7816). In every case the software should be installed -using the OS package manager to ensure it is updated with the rest of the +There are multiple options for DNS server software, unbound has become a popular +one but **feel free to use any other you are comfortable with**. When choosing your +DNS resolver software try to ensure it supports DNSSEC validation and QNAME +minimisation (RFC7816). In every case the software should be installed +using the OS package manager to ensure it is updated with the rest of the system. -By using your own DNS resolver you are less vulnerable to DNS-based censorship +By using your own DNS resolver you are less vulnerable to DNS-based censorship that your upstream resolver might impose. -Here follow specific instructions on how to install and configure unbound on -your exit - a DNSSEC-validating and caching resolver. unbound has many -configuration and tuning nobs but we try to keep these instructions as simple +Here follow specific instructions on how to install and configure unbound on +your exit - a DNSSEC-validating and caching resolver. unbound has many +configuration and tuning nobs but we try to keep these instructions as simple and short as possible and the basic setup will do just fine for most operators. -After switching to unbound verify it works as expected by resolving a valid -hostname, if it does not work, you can restore the old resolv.conf file. +After switching to unbound verify it works as expected by resolving a valid +hostname, if it does not work, you can restore the old resolv.conf file. ### Debian/Ubuntu -The following 3 commands install unbound, backup your DNS configuration and tell +The following 3 commands install unbound, backup your DNS configuration and tell the system to use the local unbound: ``` @@ -408,8 +407,8 @@ To avoid that the configuration gets changed (for example by the DHCP client): chattr +i /etc/resolv.conf ``` -The Debian configuration ships with QNAME minimisation (RFC7816) enabled -by default so you don't need to enable it explicitly. The unbound resolver you +The Debian configuration ships with QNAME minimisation (RFC7816) enabled +by default so you don't need to enable it explicitly. The unbound resolver you just installed does also DNSSEC validation. ### CentOS/RHEL @@ -454,7 +453,7 @@ chattr +i /etc/resolv.conf ### FreeBSD -FreeBSD ships unbound in the base system but the one in ports is usually +FreeBSD ships unbound in the base system but the one in ports is usually following upstream more closely so we install the unbound package: ``` @@ -491,21 +490,21 @@ chflags schg /etc/resolv.conf # Tor relay lifecycle -It takes some time for relay traffic to ramp up, this is especially true for -guard relays but to a lesser extend also for exit relays. To understand this -process, read about the lifecycle of a new relay: -https://blog.torproject.org/lifecycle-new-relay +It takes some time for relay traffic to ramp up, this is especially true for +guard relays but to a lesser extend also for exit relays. To understand this +process, read about the lifecycle of a new relay: +https://blog.torproject.org/lifecycle-new-relay # Maintaining a relay ## Backup Tor Identity Keys -After your initial installation and start of the tor daemon it is a good idea to -make a backup of your relay's long term identity keys. They are located in the -"keys" subfolder of your DataDirectory (simply make a copy of the entire folder -and store it in a secure location). Since relays have a ramp-up time it makes -sense to backup the identity key to be able to restore your relay's reputation -after a disk failure - otherwise you would have to go through the ramp-up phase +After your initial installation and start of the tor daemon it is a good idea to +make a backup of your relay's long term identity keys. They are located in the +"keys" subfolder of your DataDirectory (simply make a copy of the entire folder +and store it in a secure location). Since relays have a ramp-up time it makes +sense to backup the identity key to be able to restore your relay's reputation +after a disk failure - otherwise you would have to go through the ramp-up phase again. Default locations of the keys folder: @@ -515,41 +514,41 @@ Default locations of the keys folder: ## Subscribe to the tor-announce mailing list -This is a very low traffic mailing list and you will get information about new +This is a very low traffic mailing list and you will get information about new stable tor releases and important security update information. -* https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce +* https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce ## Setting up outage notifications -Once you setup your relay it will likely run without much work from your side. -If something goes wrong it is good to get notified automatically. We recommend -you use one of the free services that allow you to check your relay's ORPorts -for reachability and send you an email should they become unreachable for what +Once you setup your relay it will likely run without much work from your side. +If something goes wrong it is good to get notified automatically. We recommend +you use one of the free services that allow you to check your relay's ORPorts +for reachability and send you an email should they become unreachable for what ever reason. -UptimeRobot is one of these services that allow you to monitor TCP listeners on -arbitrary ports. This service can check your configured ports once every 5 -minutes and send you an email should your tor process die or become unreachable. +UptimeRobot is one of these services that allow you to monitor TCP listeners on +arbitrary ports. This service can check your configured ports once every 5 +minutes and send you an email should your tor process die or become unreachable. This checks only for the listener but does not speak the Tor protocol. -* https://uptimerobot.com/ +* https://uptimerobot.com/ -A good way to monitor a relay for its health state is to have a look at its +A good way to monitor a relay for its health state is to have a look at its bandwidth graphs. ## System Health Monitoring -To ensure your relay is healthy and not overwhelmed it makes sense to have some +To ensure your relay is healthy and not overwhelmed it makes sense to have some basic system monitoring in place to keep an eye on the following metrics: * Bandwidth * Established TCP Connections * Memory * Swap -* CPU +* CPU -There are many tools for monitoring this kind of data, munin is one of them and +There are many tools for monitoring this kind of data, munin is one of them and is relatively easy to setup. Note: **Do not make your private monitoring data graphs public since this could @@ -562,20 +561,20 @@ Some practical advice: * Smaller periods are worse. * Numbers are worse than graphs. * Real-time data is worse than historical data. -* Data in categories (IP version, in/out, etc.) is worse than total data. +* Data in categories (IP version, in/out, etc.) is worse than total data. ## Tools This section listsm a few tools that you might find handy as a Tor relay operator. -Nyx: [Nyx](https://nyx.torproject.org/) is a Tor Project tool (formerly arm) +Nyx: [Nyx](https://nyx.torproject.org/) is a Tor Project tool (formerly arm) that allows you to see real time data of your relay. -vnstat: vnstat is a command-line tool that shows the amount of data going -through your network connection. You can also use it to generate PNG pictures +vnstat: vnstat is a command-line tool that shows the amount of data going +through your network connection. You can also use it to generate PNG pictures showing traffic graphs. vnstat documentation and demo output: * https://humdi.net/vnstat/ -* https://humdi.net/vnstat/cgidemo/ +* https://humdi.net/vnstat/cgidemo/

1 0

[community/master] Remove unused macros
by hiro＠torproject.org 27 Apr '19

27 Apr '19

commit 2f17000dc5b63f6fd7aafa92e2b2538dd7445fe2 Author: hiro <hiro(a)torproject.org> Date: Sat Apr 27 21:49:53 2019 +0200 Remove unused macros --- packages/markdown-header-anchors/.gitignore | 7 ++++ packages/markdown-header-anchors/CHANGES.md | 30 +++++++++++++ packages/markdown-header-anchors/LICENSE | 31 ++++++++++++++ packages/markdown-header-anchors/MANIFEST.in | 1 + packages/markdown-header-anchors/README.md | 33 +++++++++++++++ .../lektor_markdown_header_anchors.py | 49 ++++++++++++++++++++++ packages/markdown-header-anchors/setup.cfg | 2 + packages/markdown-header-anchors/setup.py | 40 ++++++++++++++++++ templates/macros/contact.html | 3 -- templates/macros/downloads.html | 48 --------------------- templates/macros/jobs.html | 15 ------- templates/macros/people.html | 49 ---------------------- templates/macros/press.html | 19 --------- templates/macros/reports.html | 21 ---------- templates/macros/sponsors.html | 11 ----- 15 files changed, 193 insertions(+), 166 deletions(-) diff --git a/packages/markdown-header-anchors/.gitignore b/packages/markdown-header-anchors/.gitignore new file mode 100644 index 0000000..de9d237 --- /dev/null +++ b/packages/markdown-header-anchors/.gitignore @@ -0,0 +1,7 @@ +dist +build +*.egg-info +*.pyc +*.pyo +*~ +*# \ No newline at end of file diff --git a/packages/markdown-header-anchors/CHANGES.md b/packages/markdown-header-anchors/CHANGES.md new file mode 100644 index 0000000..2cfdadb --- /dev/null +++ b/packages/markdown-header-anchors/CHANGES.md @@ -0,0 +1,30 @@ +Changelog +========= + +These are all the changes in Lektor Markdown Header Anchors +since the first public release. + +0.3.1 + +Release date 25th of January, 2019 + +- Release with py2 and py3 wheel. + +0.3 + +Release date 12th of May, 2018 + +- Setup updates. +- Use random id as anchor + +0.2 + +Release date 20th of January, 2017 + +- Workaround for weird header setups + +0.1 + +Release date 24th of December, 2015 + +- Initial Release. diff --git a/packages/markdown-header-anchors/LICENSE b/packages/markdown-header-anchors/LICENSE new file mode 100644 index 0000000..0921373 --- /dev/null +++ b/packages/markdown-header-anchors/LICENSE @@ -0,0 +1,31 @@ +Copyright (c) 2015 by Armin Ronacher. + +Some rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packages/markdown-header-anchors/MANIFEST.in b/packages/markdown-header-anchors/MANIFEST.in new file mode 100644 index 0000000..64ad321 --- /dev/null +++ b/packages/markdown-header-anchors/MANIFEST.in @@ -0,0 +1 @@ +include README.md LICENSE diff --git a/packages/markdown-header-anchors/README.md b/packages/markdown-header-anchors/README.md new file mode 100644 index 0000000..6fcce47 --- /dev/null +++ b/packages/markdown-header-anchors/README.md @@ -0,0 +1,33 @@ +# lektor-markdown-header-anchors + +This plugin extends the markdown support in Lektor in a way that headlines +are given anchors and a table of contents is collected. + +## Enabling the Plugin + +To enable the plugin run this command: + +```shell +$ lektor plugins add markdown-header-anchors +``` + +## In Templates + +Within templates it becomes possible to access the `.toc` property of +markdown data. It's a list where each item has the following attributes: + +* `anchor`: the name of the anchor +* `title`: the title of the headline as HTML +* `children`: a list of headers below that header + +Example rendering: + +```jinja +<h4>Table Of Contents</h4> +<ul class="toc"> +{% for item in this.body.toc recursive %} + <li><a href="#{{ item.anchor }}">{{ item.title }}</a>{% + if item.children %}<ul>{{ loop(item.children) }}</ul>{% endif %}</li> +{% endfor %} +</ul> +``` diff --git a/packages/markdown-header-anchors/lektor_markdown_header_anchors.py b/packages/markdown-header-anchors/lektor_markdown_header_anchors.py new file mode 100644 index 0000000..1c324e5 --- /dev/null +++ b/packages/markdown-header-anchors/lektor_markdown_header_anchors.py @@ -0,0 +1,49 @@ +from lektor.pluginsystem import Plugin +import uuid +from lektor.utils import slugify +from markupsafe import Markup +from collections import namedtuple + + +TocEntry = namedtuple('TocEntry', ['anchor', 'title', 'children']) + + +class MarkdownHeaderAnchorsPlugin(Plugin): + name = 'Markdown Header Anchors' + description = u'Lektor plugin that adds anchors and table of contents to markdown headers.' + + def on_markdown_config(self, config, **extra): + class HeaderAnchorMixin(object): + def header(renderer, text, level, raw): + if self.get_config().get('anchor-type') == "random": + anchor = uuid.uuid4().hex[:6] + else: + anchor = slugify(raw) + renderer.meta['toc'].append((level, anchor, Markup(text))) + return '<h%d id="%s">%s</h%d>' % (level, anchor, text, level) + config.renderer_mixins.append(HeaderAnchorMixin) + + def on_markdown_meta_init(self, meta, **extra): + meta['toc'] = [] + + def on_markdown_meta_postprocess(self, meta, **extra): + prev_level = None + toc = [] + stack = [toc] + + for level, anchor, title in meta['toc']: + if prev_level is None: + prev_level = level + elif prev_level == level - 1: + stack.append(stack[-1][-1][2]) + prev_level = level + elif prev_level > level: + while prev_level > level: + # Just a simple workaround for when people do weird + # shit with headlines. + if len(stack) > 1: + stack.pop() + prev_level -= 1 + stack[-1].append(TocEntry(anchor, title, [])) + + meta['toc'] = toc diff --git a/packages/markdown-header-anchors/setup.cfg b/packages/markdown-header-anchors/setup.cfg new file mode 100644 index 0000000..3c6e79c --- /dev/null +++ b/packages/markdown-header-anchors/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 diff --git a/packages/markdown-header-anchors/setup.py b/packages/markdown-header-anchors/setup.py new file mode 100644 index 0000000..82f0955 --- /dev/null +++ b/packages/markdown-header-anchors/setup.py @@ -0,0 +1,40 @@ +import ast +import io +import re + +from setuptools import setup + +with io.open('README.md', 'rt', encoding="utf8") as f: + readme = f.read() + +_description_re = re.compile(r'description\s+=\s+(?P<description>.*)') + +with open('lektor_markdown_header_anchors.py', 'rb') as f: + description = str(ast.literal_eval(_description_re.search( + f.read().decode('utf-8')).group(1))) + +setup( + author='Armin Ronacher', + author_email='armin.ronacher(a)active-4.com', + description=description, + keywords='Lektor plugin markdown static-site blog toc table-of-contents anchors headers', + license='BSD', + long_description=readme, + long_description_content_type='text/markdown', + name='lektor-markdown-header-anchors', + py_modules=['lektor_markdown_header_anchors'], + url='http://github.com/lektor/lektor-markdown-header-anchors', + version='0.3.1', + classifiers=[ + 'Environment :: Plugins', + 'Environment :: Web Environment', + 'Framework :: Lektor', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + ], + entry_points={ + 'lektor.plugins': [ + 'markdown-header-anchors = lektor_markdown_header_anchors:MarkdownHeaderAnchorsPlugin', + ] + } +) diff --git a/templates/macros/contact.html b/templates/macros/contact.html deleted file mode 100644 index 9a91967..0000000 --- a/templates/macros/contact.html +++ /dev/null @@ -1,3 +0,0 @@ -{% macro render_oftc() %} - <a href="https://webchat.oftc.net/" title="Tor Project IRC" target="_blank">OFTC IRC</a> -{% endmacro %} diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html deleted file mode 100644 index 2ceaef2..0000000 --- a/templates/macros/downloads.html +++ /dev/null @@ -1,48 +0,0 @@ -{% macro render_windows(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} - {% if alt == 'en' %} - {% set alt = 'en-US' %} - {% endif %} - {% set download_link_64 = download_prefix + 'torbrowser-install-win64-' + version + '_' + alt + '.exe' %} - {% set download_link_32 = download_prefix + 'torbrowser-install-' + version + '_' + alt + '.exe' %} - {% set sig_link_64 = download_link_64 + '.asc' %} - {% set sig_link_32 = download_link_32 + '.asc' %} - - <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_32 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) -{% endmacro %} - -{% macro render_mac(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} - {% if alt == 'en' %} - {% set alt = 'en-US' %} - {% endif %} - {% set download_link = download_prefix + 'TorBrowser-' + version + '-osx64' + '_' + alt + '.dmg' %} - {% set sig_link = download_link + '.asc' %} - - <a class="downloadLink" href="{{ download_link }}">64-bit</a> (<a href="{{ sig_link }}">sig</a>) -{% endmacro %} - -{% macro render_linux(version, alt) %} - {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} - {% if alt == 'en' %} - {% set alt = 'en-US' %} - {% endif %} - {% set download_link_64 = download_prefix + 'tor-browser-linux64-' + version + '_' + alt + '.tar.xz' %} - {% set download_link_32 = download_prefix + 'tor-browser-linux32-' + version + '_' + alt + '.tar.xz' %} - {% set sig_link_64 = download_link_64 + '.asc' %} - {% set sig_link_32 = download_link_32 + '.asc' %} - - <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_32 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) -{% endmacro %} - -{% macro render_fdroid() %} - <small class="badge-pill badge-dark mx-1 nick">S00N</small> -{% endmacro %} - -{% macro render_onion_browser() %} - <a class="mx-auto" href=""><u>Onion Browser.</u></a> -{% endmacro %} - -{% macro render_tor_browser_manual() %} - <a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>tor browser manual</u></a> -{% endmacro %} diff --git a/templates/macros/jobs.html b/templates/macros/jobs.html deleted file mode 100644 index 5adad47..0000000 --- a/templates/macros/jobs.html +++ /dev/null @@ -1,15 +0,0 @@ -{% macro render_active(item, alternative) %} -<div class="card border-0"> - <div class="card-header bg-white border-0" id="headingOne"> - <h5 class="mb-0"> - <a href="{{ item.path|url }}">{{ item.title }}</a> - </h5> - </div> - <div> - <div class="card-body"> - {{ item.summary }} - <a href="{{ item.path|url }}">{{ _('Read more.') }}</a> - </div> - </div> -</div> -{% endmacro %} diff --git a/templates/macros/people.html b/templates/macros/people.html deleted file mode 100644 index 22b0121..0000000 --- a/templates/macros/people.html +++ /dev/null @@ -1,49 +0,0 @@ -{% macro render_board(item, alternative) %} - <div class="col-md-6 col-sm-12 col-xl-3 my-4"> - <div class="card h-100 my-2"> - <div class="card-body"> - <h5 class="card-title human-name">{{ item.name }}</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.title }}</h6> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.nickname }}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6> - {{ item.description }} - </div> - </div> - </div> -{% endmacro %} - -{% macro render_core(item, alternative) %} - <div class="col-md-6 col-sm-12 col-xl-3 my-3"> - <div class="card h-100"> - <div class="card-header bg-white border-0"> - {% if item.image %} - <picture> - <img src="{{ item.image|asseturl }}" class="rounded-circle float-left image-thumb" alt="{{ item.nickname }}"> - {% else %} - <img src="{{ '/static/images/people/no_photo.png'|asseturl }}" class="rounded-circle float-left image-thumb" alt="no-photo"> - {% endif %} - {% if item.twitter_handle %} - <a class="float-right py-4 px-2" href="https://twitter.com/{{ item.twitter_handle }}"><i class="fab fa-twitter"></i></a> - {% endif %} - {% if item.gpg %} - {% set link = site.get(item.gpg) %} - {% if link %} - <a class="float-right py-4 px-2" href="{{ item.gpg|asseturl }}"> - {% else %} - <a class="float-right py-4 px-2" href="{{ item.gpg }}"> - {% endif %} - <i class="fas fa-key"></i></a> - {% endif %} - </div> - <div class="card-body"> - <h5 class="card-title human-name">{{ item.name }}</h5> - {% if item.pronoun %} - <h6 class="nick text-primary m-0">PRO:{{ item.pronoun }}</h6> - {% endif %} - {% if item.nickname %} - <label class="nick text-primary">IRC:{{ item.nickname }}</label> - {% endif %} - {{ item.description }} - </div> - </div> - </div> -{% endmacro %} diff --git a/templates/macros/press.html b/templates/macros/press.html deleted file mode 100644 index 27707bf..0000000 --- a/templates/macros/press.html +++ /dev/null @@ -1,19 +0,0 @@ -{% macro render_release(item, alternative) %} -<div class="card mx-auto" style="width: 365px; height: 485px;"> - <img class="card-img-top" src="{{ '/static/images/index.svg'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <div class="card-title"> - <a class="h4 text-primary" href="{{ item.link }}">{{ item.title }}</a> - </div> - <p class="card-text description">{{ item.summary }}</p> - </div> -</div> -{% endmacro %} - -{% macro render_snippet(item, alternative) %} -<tr> - <th scope="row">{{ item.pub_date }}</th> - <td>{{ item.publisher }}</td> - <td><a class="h5 text-primary" href="{{ item.link }}">{{ item.title }}</a></td> -</tr> -{% endmacro %} diff --git a/templates/macros/reports.html b/templates/macros/reports.html deleted file mode 100644 index d9ccbe3..0000000 --- a/templates/macros/reports.html +++ /dev/null @@ -1,21 +0,0 @@ -{% macro render_document(item, alternative) %} -<tr> - <td>{{ item.title }}</td> - <td>{{ item.description }}</td> - <td><a href="{{ item.link }}">{{ _('View PDF') }}</a></td> -</tr> -{% endmacro %} - -{% macro render_report(item, alternative) %} -<tr> - <th scope="row">{{ item.date }}</th> - <td> - {% for tag in item.tags %} - {% set t = bag('tags', tag) %} - <span class="badge-pill badge-{{ t.color }}">{{ tag }}</span> - {% endfor %} - </td> - <td>{{ item.title }}</td> - <td><a href="{{ item.link }}">{{ _('View PDF') }}</a></td> -</tr> -{% endmacro %} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html deleted file mode 100644 index 377ca15..0000000 --- a/templates/macros/sponsors.html +++ /dev/null @@ -1,11 +0,0 @@ -{% macro render_active(item, alternative) %} -<div class="col-md-4 col-xl-3 my-2"> -<div class="card border-1 h-100"> - <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <h4><a href="{{ item.link }}">{{ item.name }}</a></h4> - {{ item.description }} - </div> -</div> -</div> -{% endmacro %}

1 0

[community/master] Merge remote-tracking branch 'nusenu/relay-guide'
by hiro＠torproject.org 27 Apr '19

27 Apr '19

commit e498cf9559e2f121d95e84952d8e9b02d7b09dc2 Merge: 0b39fe6 f9a99af Author: hiro <hiro(a)torproject.org> Date: Sat Apr 27 21:40:27 2019 +0200 Merge remote-tracking branch 'nusenu/relay-guide' .../relays-requirements/contents.lr | 82 ++- .../relay-operations/technical-setup/contents.lr | 564 +++++++++++++++++++++ .../relay-operations/types-of-relays/contents.lr | 77 +++ templates/relay-operations.html | 23 - 4 files changed, 722 insertions(+), 24 deletions(-)

1 0