[tor-commits] [tpo/master] Add htaccess

[hiro at torproject.org]

commit 3571e2624d2945ce75b60ddc52d9029c02486e47
Author: hiro <hiro at torproject.org>
Date:   Tue Mar 26 16:06:42 2019 +0100

    Add htaccess
---
 .htaccess                                          | 86 ++++++++++++++++++++++
 .../contents.lr                                    | 17 +++++
 .../contents.lr                                    | 17 +++++
 3 files changed, 120 insertions(+)

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..f911c21
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,86 @@
+RewriteEngine On
+
+# moved to /docs/
+RewriteRule ^faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]
+RewriteRule ^bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L]
+RewriteRule ^abuse(.*) https://2019.www.torproject.org/docs/abuse$1 [R=302,L]
+RewriteRule ^documentation(.*) https://2019.www.torproject.org/docs/documentation$1 [R=302,L]
+RewriteRule ^verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L]
+RewriteRule ^tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L]
+
+# Torbutton
+RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L]
+RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L]
+
+# Tor Browser
+RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
+#RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L]
+RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L]
+
+# tordnsel
+RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L]
+
+# Overview
+RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
+
+# Press
+RewriteRule ^press/$ /press/press [R=301,L]
+RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
+
+# Projects
+RewriteRule ^projects/$ /projects/projects [R=301,L]
+
+#Pluggable Transports
+RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L]
+RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
+
+#Relays
+RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=301,L]
+
+# GetInvolved
+RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
+RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
+RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L]
+
+RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L]
+RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
+
+# Support
+RewriteRule ^support(.*) https://support.torproject.org [R=301,L]
+
+# Newsletter
+RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L]
+
+# other (feel free to categorize)
+RewriteRule ^people(.*) /about/people$1 [R=301,L]
+RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]
+RewriteRule ^about/contact(.*) /contact$1 [R=301,L]
+
+# Download websites
+RewriteRule ^download/download/$ /download [R=301,L]
+RewriteRule ^download/download.html(.*) /download [R=301,L]
+RewriteRule ^download/easy-download(.*) /download [R=301,L]
+
+# Relays
+RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L]
+
+# Index Pages
+RewriteRule ^about/$ /about/history [R=301,L]
+
+# Donation campaign
+# 2017
+# Special-case the donate-options and amazon page so it doesn't get redirected
+RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
+RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
+RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L]
+RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
+RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
+RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
+
+# The following redirect is necessary because we're using that URL on
+# some external resources (the donate infrastructure in particular) and
+# getting it changed there is apparently hard or something.
+RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]
diff --git a/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr
new file mode 100644
index 0000000..b6885fc
--- /dev/null
+++ b/content/press/cracks-in-the-wall-discussion-of-tor-being-used-for-evading-censorship-by-repressive-governments/contents.lr
@@ -0,0 +1,17 @@
+_model: post
+---
+active: True
+---
+type: snippet
+---
+publisher:  Forbes
+---
+title:  Cracks In the Wall. Discussion of Tor being used for evading censorship by repressive governments.
+---
+link:  http://members.forbes.com/global/2006/0227/018A_2.html
+---
+pub_date:  2006-02-27
+---
+summary:
+---
+body:
diff --git a/content/press/oped-on-hidden-services-and-censorship/contents.lr b/content/press/oped-on-hidden-services-and-censorship/contents.lr
new file mode 100644
index 0000000..d7a66a2
--- /dev/null
+++ b/content/press/oped-on-hidden-services-and-censorship/contents.lr
@@ -0,0 +1,17 @@
+_model: post
+---
+active: True
+---
+type: snippet
+---
+publisher:  The Independent
+---
+title:  OpEd on hidden services and censorship
+---
+link:  http://www.independent.co.uk/voices/comment/the-dark-web-is-not-just-for-paedophiles-drug-dealers-and-terrorists-9920667.html
+---
+pub_date:  2014-12-12
+---
+summary:
+---
+body: