Browse code

Add redirect rule for relay guide

hiromipaw authored on14/02/2018 16:37:31
Showing1 changed files
... ...
@@ -36,6 +36,9 @@ RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transpor
36 36
 RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L]
37 37
 RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
38 38
 
39
+#Relays
40
+RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=301,L]
41
+
39 42
 # GetInvolved
40 43
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
41 44
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
Browse code

Remove redirects add video from extra

hiromipaw authored on21/12/2017 16:55:22
Showing1 changed files
... ...
@@ -84,7 +84,6 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302
84 84
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85 85
 RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
87
-RewriteRule ^averyonionthankyou(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L]
88 87
 
89 88
 # The following redirect is necessary because we're using that URL on
90 89
 # some external resources (the donate infrastructure in particular) and
Browse code

Change redirect url

hiromipaw authored on21/12/2017 16:09:28
Showing1 changed files
... ...
@@ -84,7 +84,7 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302
84 84
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85 85
 RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
87
-RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L]
87
+RewriteRule ^averyonionthankyou(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L]
88 88
 
89 89
 # The following redirect is necessary because we're using that URL on
90 90
 # some external resources (the donate infrastructure in particular) and
Browse code

Fix previous redirect

hiromipaw authored on21/12/2017 13:55:35
Showing1 changed files
... ...
@@ -84,7 +84,6 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302
84 84
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85 85
 RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
87
-RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L]
88 87
 RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L]
89 88
 
90 89
 # The following redirect is necessary because we're using that URL on
Browse code

Fix redirect

hiromipaw authored on21/12/2017 13:44:44
Showing1 changed files
... ...
@@ -85,7 +85,7 @@ RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/priva
85 85
 RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
87 87
 RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L]
88
-RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=302,L]
88
+RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=301,L]
89 89
 
90 90
 # The following redirect is necessary because we're using that URL on
91 91
 # some external resources (the donate infrastructure in particular) and
Browse code

Add redirect for youtube embed

hiromipaw authored on21/12/2017 13:31:02
Showing1 changed files
... ...
@@ -84,6 +84,8 @@ RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302
84 84
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85 85
 RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
87
+RewriteRule ^averyonionthankyou(.*) /averyonionthankyou.html.en [R=302,L]
88
+RewriteRule ^embed/onionvideo(.*) https://www.youtube.com/embed/TXT0F7p7WbM [R=302,L]
87 89
 
88 90
 # The following redirect is necessary because we're using that URL on
89 91
 # some external resources (the donate infrastructure in particular) and
Browse code

Fix thankyou redirect

hiromipaw authored on20/12/2017 11:46:50
Showing1 changed files
... ...
@@ -74,7 +74,7 @@ RewriteRule ^images/$ / [R=301,L]
74 74
 RewriteRule ^include/$ / [R=301,L]
75 75
 RewriteRule ^js/$ / [R=301,L]
76 76
 
77
-# Donation campagin
77
+# Donation campaign
78 78
 # 2017
79 79
 # Special-case the donate-options and amazon page so it doesn't get redirected
80 80
 RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
... ...
@@ -82,6 +82,7 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
82 82
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
83 83
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L]
84 84
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85
+RewriteRule ^donate/thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
85 86
 RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
86 87
 
87 88
 # The following redirect is necessary because we're using that URL on
Browse code

Bug 24589: Redirect Amazon Payment users to https://donate.torproject.org/thank-you

Arthur Edelstein authored on19/12/2017 19:53:10
Showing1 changed files
... ...
@@ -75,13 +75,14 @@ RewriteRule ^include/$ / [R=301,L]
75 75
 RewriteRule ^js/$ / [R=301,L]
76 76
 
77 77
 # Donation campagin
78
-# 2016
78
+# 2017
79 79
 # Special-case the donate-options and amazon page so it doesn't get redirected
80 80
 RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
81 81
 RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
82 82
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
83
-RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
84
-RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]
83
+RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L]
84
+RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L]
85
+RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
85 86
 
86 87
 # The following redirect is necessary because we're using that URL on
87 88
 # some external resources (the donate infrastructure in particular) and
Browse code

Fix typo in htaccess

hiromipaw authored on27/10/2017 14:30:32
Showing1 changed files
... ...
@@ -48,7 +48,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
48 48
 RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support [R=301,L]
49 49
 
50 50
 # Newsletter
51
-RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=3-1,L]
51
+RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L]
52 52
 
53 53
 # other (feel free to categorize)
54 54
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
Browse code

Add redirect to newsletter

hiromipaw authored on27/10/2017 14:02:04
Showing1 changed files
... ...
@@ -47,6 +47,9 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
47 47
 # Support
48 48
 RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support [R=301,L]
49 49
 
50
+# Newsletter
51
+RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=3-1,L]
52
+
50 53
 # other (feel free to categorize)
51 54
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
52 55
 RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]
Browse code

Add redirect to support wiki

hiromipaw authored on27/10/2017 14:01:43
Showing1 changed files
... ...
@@ -44,6 +44,9 @@ RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L]
44 44
 RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L]
45 45
 RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
46 46
 
47
+# Support
48
+RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support [R=301,L]
49
+
47 50
 # other (feel free to categorize)
48 51
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
49 52
 RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]
Browse code

Updates the README regarding minifying sources

hiromipaw authored on03/07/2017 09:56:57
Showing1 changed files
... ...
@@ -1,7 +1,5 @@
1 1
 RewriteEngine On
2 2
 
3
-#ErrorDocument 404 /404
4
-
5 3
 # moved to /docs/
6 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
7 5
 RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
Browse code

removing 404 page and restoring htaccess

hiromipaw authored on01/07/2017 10:34:22
Showing1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 RewriteEngine On
2 2
 
3
-ErrorDocument 404 /404
3
+#ErrorDocument 404 /404
4 4
 
5 5
 # moved to /docs/
6 6
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
Browse code

Add personalised 404 page

hiromipaw authored on01/07/2017 10:02:23
Showing1 changed files
... ...
@@ -1,5 +1,7 @@
1 1
 RewriteEngine On
2 2
 
3
+ErrorDocument 404 /404
4
+
3 5
 # moved to /docs/
4 6
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 7
 RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
... ...
@@ -81,5 +83,3 @@ RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/priva
81 83
 # some external resources (the donate infrastructure in particular) and
82 84
 # getting it changed there is apparently hard or something.
83 85
 RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]
84
-
85
-
Browse code

Add note explaining a redirect

Sebastian Hahn authored on05/12/2016 21:39:12
Showing1 changed files
... ...
@@ -76,6 +76,10 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
76 76
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
77 77
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
78 78
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]
79
+
80
+# The following redirect is necessary because we're using that URL on
81
+# some external resources (the donate infrastructure in particular) and
82
+# getting it changed there is apparently hard or something.
79 83
 RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]
80 84
 
81 85
 
Browse code

Scramble to get shit less fucked up

Sebastian Hahn authored on03/12/2016 00:59:34
Showing1 changed files
... ...
@@ -76,5 +76,6 @@ RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
76 76
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
77 77
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
78 78
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]
79
+RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L]
79 80
 
80 81
 
Browse code

Don't redirect amazon donation page

Sebastian Hahn authored on23/11/2016 03:15:36
Showing1 changed files
... ...
@@ -70,8 +70,9 @@ RewriteRule ^js/$ / [R=301,L]
70 70
 
71 71
 # Donation campagin
72 72
 # 2016
73
-# Special-case the donate-options page so it doesn't get redirected
73
+# Special-case the donate-options and amazon page so it doesn't get redirected
74 74
 RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
75
+RewriteRule ^donate/donate-amazon(.*) /donate/donate-amazon$1 [END]
75 76
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
76 77
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
77 78
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]
Browse code

Redirect /PT as well as /PT/

Implements #20730, thanks dcf

Sebastian Hahn authored on23/11/2016 02:34:19
Showing1 changed files
... ...
@@ -31,7 +31,7 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
31 31
 RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33 33
 #Pluggable Transports
34
-RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
34
+RewriteRule ^PT/?$ /docs/pluggable-transports [R=301,L]
35 35
 RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L]
36 36
 RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L]
37 37
 RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
Browse code

Couple of rewrite rule tweaks

Sebastian Hahn authored on23/11/2016 02:12:41
Showing1 changed files
... ...
@@ -46,7 +46,7 @@ RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
46 46
 
47 47
 # other (feel free to categorize)
48 48
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
49
-RewriteRule ^donate/$ /donate/donate [R=301,L]
49
+RewriteRule ^donate/$ https://donate.torproject.org [R=302,L]
50 50
 RewriteRule ^contact(.*) /about/contact$1 [R=301,L]
51 51
 
52 52
 # Download websites
... ...
@@ -74,6 +74,6 @@ RewriteRule ^js/$ / [R=301,L]
74 74
 RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
75 75
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
76 76
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
77
-RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L]
77
+RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy.html [R=302,L]
78 78
 
79 79
 
Browse code

Stop redirect processing if donate-options matches

Sebastian Hahn authored on23/11/2016 01:19:14
Showing1 changed files
... ...
@@ -71,7 +71,7 @@ RewriteRule ^js/$ / [R=301,L]
71 71
 # Donation campagin
72 72
 # 2016
73 73
 # Special-case the donate-options page so it doesn't get redirected
74
-RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [L]
74
+RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [END]
75 75
 RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
76 76
 RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
77 77
 RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L]
Browse code

Simplify redirect rules a bunch

Sebastian Hahn authored on23/11/2016 01:12:52
Showing1 changed files
... ...
@@ -70,52 +70,10 @@ RewriteRule ^js/$ / [R=301,L]
70 70
 
71 71
 # Donation campagin
72 72
 # 2016
73
-RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
74
-RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
75
-RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
76
-RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
77
-RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
78
-RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
79
-RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
80
-RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
81
-RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
82
-RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
83
-RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
84
-RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
85
-RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
86
-RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
87
-RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
88
-RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
89
-RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
90
-RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
91
-RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L]
92
-RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L]
93
-RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L]
94
-RewriteRule ^donate/donate https://donate.torproject.org [R=302,L]
95
-RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L]
96
-
97
-# 2015
98
-RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
99
-RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
100
-RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
101
-RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
102
-RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
103
-RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L]
104
-RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
105
-RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
106
-RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
107
-RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
108
-RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
109
-RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
110
-RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
111
-RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
112
-RewriteRule ^donate/donate-appelbaum(.*) /donate/donate$1 [R=302,L]
113
-RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
114
-RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L]
115
-RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L]
116
-#keep prefixes of other entries down here...
117
-RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
118
-
119
-# yuck, https://twitter.com/torproject/status/677928074630049793
120
-RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
73
+# Special-case the donate-options page so it doesn't get redirected
74
+RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [L]
75
+RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
76
+RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
77
+RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L]
78
+
121 79
 
Browse code

Bug 20734: Fix links and redirects for new donation site

Arthur Edelstein authored on22/11/2016 07:02:06
Showing1 changed files
... ...
@@ -88,13 +88,16 @@ RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
88 88
 RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
89 89
 RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
90 90
 RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
91
+RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L]
92
+RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L]
93
+RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L]
94
+RewriteRule ^donate/donate https://donate.torproject.org [R=302,L]
95
+RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L]
91 96
 
92 97
 # 2015
93 98
 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
94 99
 RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
95 100
 RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
96
-RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
97
-RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
98 101
 RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
99 102
 RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
100 103
 RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L]
Browse code

Move current campaign redirects up

Sebastian Hahn authored on18/11/2016 14:53:28
Showing1 changed files
... ...
@@ -69,6 +69,27 @@ RewriteRule ^include/$ / [R=301,L]
69 69
 RewriteRule ^js/$ / [R=301,L]
70 70
 
71 71
 # Donation campagin
72
+# 2016
73
+RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
74
+RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
75
+RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
76
+RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
77
+RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
78
+RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
79
+RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
80
+RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
81
+RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
82
+RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
83
+RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
84
+RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
85
+RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
86
+RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
87
+RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
88
+RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
89
+RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
90
+RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
91
+
92
+# 2015
72 93
 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
73 94
 RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
74 95
 RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
... ...
@@ -95,21 +116,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
95 116
 # yuck, https://twitter.com/torproject/status/677928074630049793
96 117
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
97 118
 
98
-RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
99
-RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
100
-RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
101
-RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
102
-RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
103
-RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
104
-RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
105
-RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
106
-RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
107
-RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
108
-RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
109
-RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
110
-RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
111
-RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
112
-RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
113
-RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
114
-RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
115
-RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
Browse code

Implement rewrite rules for donation campaign, again

Sebastian Hahn authored on18/11/2016 13:55:41
Showing1 changed files
... ...
@@ -95,3 +95,21 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
95 95
 # yuck, https://twitter.com/torproject/status/677928074630049793
96 96
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
97 97
 
98
+RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
99
+RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
100
+RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
101
+RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
102
+RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
103
+RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
104
+RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
105
+RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
106
+RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
107
+RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
108
+RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
109
+RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
110
+RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
111
+RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
112
+RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
113
+RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
114
+RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
115
+RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
Browse code

Revert "Implement rewrite rules for donation campaign"

This reverts commit 10b8d933481f2820e7d6a3bca41d5dba441c9932.

Sebastian Hahn authored on18/11/2016 13:59:37
Showing1 changed files
... ...
@@ -95,22 +95,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
95 95
 # yuck, https://twitter.com/torproject/status/677928074630049793
96 96
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
97 97
 
98
-RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
99
-RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
100
-RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
101
-RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
102
-RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
103
-RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
104
-RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
105
-RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
106
-RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
107
-RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
108
-RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
109
-RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
110
-RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
111
-RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
112
-RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
113
-RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
114
-RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
115
-RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
116
- [R=302,L]
Browse code

Implement rewrite rules for donation campaign

Sebastian Hahn authored on18/11/2016 13:55:41
Showing1 changed files
... ...
@@ -95,3 +95,22 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
95 95
 # yuck, https://twitter.com/torproject/status/677928074630049793
96 96
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
97 97
 
98
+RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
99
+RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
100
+RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
101
+RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
102
+RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
103
+RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
104
+RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
105
+RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
106
+RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
107
+RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
108
+RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
109
+RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
110
+RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
111
+RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
112
+RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
113
+RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
114
+RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
115
+RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
116
+ [R=302,L]
Browse code

Fix up rewrite rules

Sebastian Hahn authored on14/07/2016 21:32:23
Showing1 changed files
... ...
@@ -32,9 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33 33
 #Pluggable Transports
34 34
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
35
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
36
-RewriteRule ^projects/obfsproxy-debian-instructions/$ /docs/pluggable-transports [R=410,L]
37
-RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L]
35
+RewriteRule ^projects/obfsproxy-debian-instructions(.*) /docs/pluggable-transports [R=410,L]
36
+RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports [R=410,L]
37
+RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
38 38
 
39 39
 # GetInvolved
40 40
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
Browse code

Fix up PT changes

Sebastian Hahn authored on14/07/2016 21:20:36
Showing1 changed files
... ...
@@ -32,7 +32,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33 33
 #Pluggable Transports
34 34
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
35
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
35
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
36 36
 RewriteRule ^projects/obfsproxy-debian-instructions/$ /docs/pluggable-transports [R=410,L]
37 37
 RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L]
38 38
 
Browse code

redirect old obfsproxy pages to PT page

Nima Fatemi authored on07/07/2016 00:03:52
Showing1 changed files
... ...
@@ -32,6 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33 33
 #Pluggable Transports
34 34
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
35
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
36
+RewriteRule ^projects/obfsproxy-debian-instructions/$ /docs/pluggable-transports [R=410,L]
37
+RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports [R=410,L]
35 38
 
36 39
 # GetInvolved
37 40
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
Browse code

make torproject.org/PT shortlink for PT page

Nima Fatemi authored on06/07/2016 18:34:48
Showing1 changed files
... ...
@@ -30,6 +30,9 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
30 30
 # Projects
31 31
 RewriteRule ^projects/$ /projects/projects [R=301,L]
32 32
 
33
+#Pluggable Transports
34
+RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
35
+
33 36
 # GetInvolved
34 37
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
35 38
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
Browse code

Attempt to get rid of visible directory indices

Sebastian Hahn authored on28/06/2016 00:12:06
Showing1 changed files
... ...
@@ -51,6 +51,17 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
51 51
 # Relays
52 52
 RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
53 53
 
54
+# Index Pages
55
+RewriteRule ^about/$ /about/overview [R=301,L]
56
+RewriteRule ^cgi-bin/$ / [R=301,L]
57
+RewriteRule ^css/$ / [R=301,L]
58
+RewriteRule ^docs/$ /docs/documentation [R=301,L]
59
+RewriteRule ^eff/$ / [R=301,L]
60
+RewriteRule ^en/$ / [R=301,L]
61
+RewriteRule ^images/$ / [R=301,L]
62
+RewriteRule ^include/$ / [R=301,L]
63
+RewriteRule ^js/$ / [R=301,L]
64
+
54 65
 # Donation campagin
55 66
 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
56 67
 RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
Browse code

Attempt to fix the redirect crazyness

Sebastian Hahn authored on09/03/2016 20:50:46
Showing1 changed files
... ...
@@ -29,7 +29,6 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
29 29
 
30 30
 # Projects
31 31
 RewriteRule ^projects/$ /projects/projects [R=301,L]
32
-RewriteRule ^projects/tormessenger(.*)$ https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger [R=301,L]
33 32
 
34 33
 # GetInvolved
35 34
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
Browse code

try doing the tormessenger redirect at the htaccess level

Roger Dingledine authored on09/03/2016 20:38:23
Showing1 changed files
... ...
@@ -29,6 +29,7 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
29 29
 
30 30
 # Projects
31 31
 RewriteRule ^projects/$ /projects/projects [R=301,L]
32
+RewriteRule ^projects/tormessenger(.*)$ https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger [R=301,L]
32 33
 
33 34
 # GetInvolved
34 35
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
Browse code

Add donation redirect for Jake.

Mike Perry authored on08/01/2016 19:44:03
Showing1 changed files
... ...
@@ -68,6 +68,7 @@ RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68 68
 RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69 69
 RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70 70
 RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
71
+RewriteRule ^donate/donate-appelbaum(.*) /donate/donate$1 [R=302,L]
71 72
 RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
72 73
 RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L]
73 74
 RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L]
Browse code

Add donate-blog-landau

Nick Mathewson authored on03/01/2016 02:56:08
Showing1 changed files
... ...
@@ -70,6 +70,7 @@ RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70 70
 RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
71 71
 RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
72 72
 RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L]
73
+RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L]
73 74
 #keep prefixes of other entries down here...
74 75
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
75 76
 
Browse code

another champion

Nick Mathewson authored on02/01/2016 00:20:47
Showing1 changed files
... ...
@@ -69,6 +69,7 @@ RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69 69
 RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70 70
 RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
71 71
 RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
72
+RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L]
72 73
 #keep prefixes of other entries down here...
73 74
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
74 75
 
Browse code

Actually, I hope that ES is mentioned just a couple more places than our blog.

Mike Perry authored on30/12/2015 16:42:02
Showing1 changed files
... ...
@@ -67,7 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67 67
 RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68 68
 RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69 69
 RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70
-RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L]
70
+RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
71 71
 RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
72 72
 #keep prefixes of other entries down here...
73 73
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
Browse code

Add donate link for ES.

Mike Perry authored on30/12/2015 16:40:54
Showing1 changed files
... ...
@@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67 67
 RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68 68
 RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69 69
 RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70
+RewriteRule ^donate/donate-blog-snowden(.*) /donate/donate$1 [R=302,L]
70 71
 RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
71 72
 #keep prefixes of other entries down here...
72 73
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
Browse code

CCC Donations link.

Mike Perry authored on29/12/2015 12:30:50
Showing1 changed files
... ...
@@ -67,6 +67,7 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67 67
 RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68 68
 RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69 69
 RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
70
+RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
70 71
 #keep prefixes of other entries down here...
71 72
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
72 73
 
Browse code

landing page for alison

Nick Mathewson authored on28/12/2015 19:00:14
Showing1 changed files
... ...
@@ -66,6 +66,7 @@ RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
66 66
 RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67 67
 RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68 68
 RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
69
+RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
69 70
 #keep prefixes of other entries down here...
70 71
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
71 72
 
Browse code

another champion, another rewrite. I hope I am doing this right.

Nick Mathewson authored on26/12/2015 21:17:14
Showing1 changed files
... ...
@@ -65,6 +65,7 @@ RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
65 65
 RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
66 66
 RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67 67
 RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
68
+RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
68 69
 #keep prefixes of other entries down here...
69 70
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
70 71
 
Browse code

Make donate-blog-benw page

Sebastian Hahn authored on22/12/2015 18:14:07
Showing1 changed files
... ...
@@ -64,6 +64,7 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
64 64
 RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
65 65
 RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
66 66
 RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
67
+RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
67 68
 #keep prefixes of other entries down here...
68 69
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
69 70
 
Browse code

add a redirect for the george torwell donations drive

Roger Dingledine authored on22/12/2015 06:49:09
Showing1 changed files
... ...
@@ -59,6 +59,7 @@ RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
59 59
 RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
60 60
 RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
61 61
 RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
62
+RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L]
62 63
 RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
63 64
 RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
64 65
 RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
Browse code

Add redirect for broken url used on twitter...

Sebastian Hahn authored on19/12/2015 12:28:35
Showing1 changed files
... ...
@@ -66,3 +66,6 @@ RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
66 66
 #keep prefixes of other entries down here...
67 67
 RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
68 68
 
69
+# yuck, https://twitter.com/torproject/status/677928074630049793
70
+RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
71
+
Browse code

arthuredelstein just noticed this fuckup

Sebastian Hahn authored on19/12/2015 02:05:23
Showing1 changed files
... ...
@@ -53,7 +53,6 @@ RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
53 53
 
54 54
 # Donation campagin
55 55
 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
56
-RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
57 56
 RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
58 57
 RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
59 58
 RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
... ...
@@ -64,4 +63,6 @@ RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
64 63
 RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
65 64
 RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
66 65
 RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
66
+#keep prefixes of other entries down here...
67
+RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
67 68
 
Browse code

Add donate-hpbanner redirect

Sebastian Hahn authored on19/12/2015 02:00:32
Showing1 changed files
... ...
@@ -63,4 +63,5 @@ RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
63 63
 RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
64 64
 RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
65 65
 RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
66
+RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
66 67
 
Browse code

add donate-blog-cory

Sebastian Hahn authored on17/12/2015 23:03:34
Showing1 changed files
... ...
@@ -62,4 +62,5 @@ RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
62 62
 RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
63 63
 RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
64 64
 RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
65
+RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
65 66
 
Browse code

make a rabbirob-donate url

Sebastian Hahn authored on14/12/2015 14:17:42
Showing1 changed files
... ...
@@ -61,4 +61,5 @@ RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
61 61
 RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
62 62
 RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
63 63
 RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
64
+RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
64 65
 
Browse code

Add url for molly blogpost

Sebastian Hahn authored on09/12/2015 23:01:30
Showing1 changed files
... ...
@@ -60,4 +60,5 @@ RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
60 60
 RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
61 61
 RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
62 62
 RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
63
+RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
63 64
 
Browse code

add a new redirect from donate-roger to donate

Roger Dingledine authored on01/12/2015 23:27:55
Showing1 changed files
... ...
@@ -59,3 +59,5 @@ RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
59 59
 RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
60 60
 RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
61 61
 RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
62
+RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
63
+
Browse code

Add giving-tue-blog donate redirect (#17571)

Sebastian Hahn authored on01/12/2015 07:59:16
Showing1 changed files
... ...
@@ -58,3 +58,4 @@ RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
58 58
 RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
59 59
 RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
60 60
 RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
61
+RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
Browse code

Fix donate redirect rules

Sebastian Hahn authored on20/11/2015 17:42:16
Showing1 changed files
... ...
@@ -52,8 +52,9 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
52 52
 RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
53 53
 
54 54
 # Donation campagin
55
-RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L]
56
-RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L]
57
-RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L]
58
-RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L]
59
-RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L]
55
+RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
56
+RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
57
+RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
58
+RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
59
+RewriteRule ^donate/donate-download(.*) /donate/donate$1 [R=302,L]
60
+RewriteRule ^donate/donate-button(.*) /donate/donate$1 [R=302,L]
Browse code

Try the donation redirect hack

Sebastian Hahn authored on20/11/2015 17:13:31
Showing1 changed files
... ...
@@ -50,3 +50,10 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
50 50
 
51 51
 # Relays
52 52
 RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
53
+
54
+# Donation campagin
55
+RewriteRule ^donate-twitter(.*) /donate/donate$1 [R=302,L]
56
+RewriteRule ^donate-hp(.*) /donate/donate$1 [R=302,L]
57
+RewriteRule ^donate-tbb(.*) /donate/donate$1 [R=302,L]
58
+RewriteRule ^donate-banner(.*) /donate/donate$1 [R=302,L]
59
+RewriteRule ^donate-download(.*) /donate/donate$1 [R=302,L]
Browse code

Remove vidalia-related docs and downloads

The downloads are horribly outdated, the docs are confusing and long.
Without a proper Vidalia maintainer and someone making packages, this
has no future.

Sebastian Hahn authored on08/02/2015 17:55:35
Showing1 changed files
... ...
@@ -23,10 +23,6 @@ RewriteRule ^tordnsel/dist/(.*) /dist/tordnsel/$1 [R=301,L]
23 23
 # Overview
24 24
 RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
25 25
 
26
-# Vidalia
27
-RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
28
-RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
29
-
30 26
 # Press
31 27
 RewriteRule ^press/$ /press/press [R=301,L]
32 28
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
Browse code

More tordnsel/dist to /dist/tordnsel

Peter Palfrader authored on17/10/2014 10:51:27
Showing1 changed files
... ...
@@ -17,6 +17,9 @@ RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
17 17
 #RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L]
18 18
 RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L]
19 19
 
20
+# tordnsel
21
+RewriteRule ^tordnsel/dist/(.*) /dist/tordnsel/$1 [R=301,L]
22
+
20 23
 # Overview
21 24
 RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
22 25
 
Browse code

allow old torbutton link to redirect

Roger Dingledine authored on22/07/2014 20:08:17
Showing1 changed files
... ...
@@ -10,6 +10,7 @@ RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
10 10
 
11 11
 # Torbutton
12 12
 RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]
13
+RewriteRule ^torbutton/(.*) /docs/torbutton/$1 [R=301,L]
13 14
 
14 15
 # Tor Browser
15 16
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
Browse code

move manpages to docs, move torbutton to docs, update rewrite rules for new paths.

Andrew Lewman authored on24/04/2014 16:39:20
Showing1 changed files
... ...
@@ -9,12 +9,12 @@ RewriteRule ^verifying-signatures(.*) /docs/verifying-signatures$1 [R=301,L]
9 9
 RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
10 10
 
11 11
 # Torbutton
12
-RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
12
+RewriteRule ^torbutton/design(.*) /docs/torbutton/en/design$1 [R=301,L]
13 13
 
14 14
 # Tor Browser
15 15
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
16
-RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L]
17
-RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L]
16
+#RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L]
17
+RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L]
18 18
 
19 19
 # Overview
20 20
 RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
Browse code

make tpo/torbrowser rewrite to torbrowser.html.en.

Andrew Lewman authored on13/11/2012 03:03:01
Showing1 changed files
... ...
@@ -13,7 +13,7 @@ RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
13 13
 
14 14
 # Tor Browser
15 15
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
16
-RewriteRule ^torbrowser/$ /projects/torbrowser [R=301,L]
16
+RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L]
17 17
 RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L]
18 18
 
19 19
 # Overview
Browse code

since the research page is gone, redirect it rather than leaving it a 404

Roger Dingledine authored on20/08/2012 20:33:20
Showing1 changed files
... ...
@@ -33,9 +33,11 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
33 33
 # GetInvolved
34 34
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
35 35
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
36
-RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
37 36
 RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L]
38 37
 
38
+RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L]
39
+RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L]
40
+
39 41
 # other (feel free to categorize)
40 42
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
41 43
 RewriteRule ^donate/$ /donate/donate [R=301,L]
Browse code

ha. we've been giving out a broken tshirt link to all our high-value donators.

Roger Dingledine authored on03/04/2012 23:31:02
Showing1 changed files
... ...
@@ -34,6 +34,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
34 34
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
35 35
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
36 36
 RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
37
+RewriteRule ^tshirt(.*) /getinvolved/tshirt$1 [R=301,L]
37 38
 
38 39
 # other (feel free to categorize)
39 40
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
Browse code

change the relays rewrite rule to be more general.

Andrew Lewman authored on12/03/2012 00:07:30
Showing1 changed files
... ...
@@ -46,4 +46,4 @@ RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
46 46
 RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
47 47
 
48 48
 # Relays
49
-RewriteRule ^relays/$ /getinvolved/relays [R=301,L]
49
+RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
Browse code

redirect away.

Andrew Lewman authored on11/03/2012 23:40:03
Showing1 changed files
... ...
@@ -45,3 +45,5 @@ RewriteRule ^download/$ /download/download [R=301,L]
45 45
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
46 46
 RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
47 47
 
48
+# Relays
49
+RewriteRule ^relays/$ /getinvolved/relays [R=301,L]
Browse code

the torrc we ship in 0.2.2, and have no plans to change, points people to https://www.torproject.org/tor-manual.html

Roger Dingledine authored on08/02/2012 09:38:43
Showing1 changed files
... ...
@@ -6,6 +6,7 @@ RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
6 6
 RewriteRule ^abuse(.*) /docs/abuse$1 [R=301,L]
7 7
 RewriteRule ^documentation(.*) /docs/documentation$1 [R=301,L]
8 8
 RewriteRule ^verifying-signatures(.*) /docs/verifying-signatures$1 [R=301,L]
9
+RewriteRule ^tor-manual(.*) /docs/tor-manual$1 [R=301,L]
9 10
 
10 11
 # Torbutton
11 12
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
Browse code

add a contact rewrite.

Andrew Lewman authored on15/12/2011 16:43:05
Showing1 changed files
... ...
@@ -37,6 +37,7 @@ RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
37 37
 # other (feel free to categorize)
38 38
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
39 39
 RewriteRule ^donate/$ /donate/donate [R=301,L]
40
+RewriteRule ^contact(.*) /about/contact$1 [R=301,L]
40 41
 
41 42
 # Download websites
42 43
 RewriteRule ^download/$ /download/download [R=301,L]
Browse code

make download-easy the default.

Andrew Lewman authored on04/09/2011 15:41:39
Showing1 changed files
... ...
@@ -41,5 +41,5 @@ RewriteRule ^donate/$ /donate/donate [R=301,L]
41 41
 # Download websites
42 42
 RewriteRule ^download/$ /download/download [R=301,L]
43 43
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
44
-RewriteRule ^easy-download(.*) /download/download$1 [R=301,L]
44
+RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
45 45
 
Browse code

Add the verifying-signatures page to the redirects

Sebastian Hahn authored on18/11/2010 10:09:12
Showing1 changed files
... ...
@@ -5,6 +5,7 @@ RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 5
 RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
6 6
 RewriteRule ^abuse(.*) /docs/abuse$1 [R=301,L]
7 7
 RewriteRule ^documentation(.*) /docs/documentation$1 [R=301,L]
8
+RewriteRule ^verifying-signatures(.*) /docs/verifying-signatures$1 [R=301,L]
8 9
 
9 10
 # Torbutton
10 11
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
Browse code

Fix rewrite rules as per ticket 2122

Sebastian Hahn authored on28/10/2010 07:26:01
Showing1 changed files
... ...
@@ -22,14 +22,14 @@ RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
22 22
 RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
23 23
 
24 24
 # Press
25
-RewriteRule ^press/$ /press/press.html.en [R=301,L]
25
+RewriteRule ^press/$ /press/press [R=301,L]
26 26
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
27 27
 
28 28
 # Projects
29
-RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
29
+RewriteRule ^projects/$ /projects/projects [R=301,L]
30 30
 
31 31
 # GetInvolved
32
-RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
32
+RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
33 33
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
34 34
 RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
35 35
 
Browse code

make the old donate page not point to a file index

Roger Dingledine authored on27/10/2010 12:37:54
Showing1 changed files
... ...
@@ -32,7 +32,10 @@ RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
32 32
 RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
33 33
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
34 34
 RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
35
+
36
+# other (feel free to categorize)
35 37
 RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
38
+RewriteRule ^donate/$ /donate/donate [R=301,L]
36 39
 
37 40
 # Download websites
38 41
 RewriteRule ^download/$ /download/download [R=301,L]
Browse code

make the old people page work again too

Roger Dingledine authored on27/10/2010 12:12:30
Showing1 changed files
... ...
@@ -32,6 +32,7 @@ RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
32 32
 RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
33 33
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
34 34
 RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
35
+RewriteRule ^people(.*) /about/corepeople$1 [R=301,L]
35 36
 
36 37
 # Download websites
37 38
 RewriteRule ^download/$ /download/download [R=301,L]
Browse code

Add a documentation redirect

Sebastian Hahn authored on24/10/2010 00:03:33
Showing1 changed files
... ...
@@ -4,6 +4,7 @@ RewriteEngine On
4 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 5
 RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
6 6
 RewriteRule ^abuse(.*) /docs/abuse$1 [R=301,L]
7
+RewriteRule ^documentation(.*) /docs/documentation$1 [R=301,L]
7 8
 
8 9
 # Torbutton
9 10
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
Browse code

Add a missing $. Thanks arma

Sebastian Hahn authored on20/10/2010 20:19:59
Showing1 changed files
... ...
@@ -10,7 +10,7 @@ RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
10 10
 
11 11
 # Tor Browser
12 12
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
13
-RewriteRule ^torbrowser/ /projects/torbrowser [R=301,L]
13
+RewriteRule ^torbrowser/$ /projects/torbrowser [R=301,L]
14 14
 RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L]
15 15
 
16 16
 # Overview
Browse code

Add two rewrite rules based on suggestion from mo

Sebastian Hahn authored on20/10/2010 15:07:30
Showing1 changed files
... ...
@@ -1,7 +1,9 @@
1 1
 RewriteEngine On
2 2
 
3
-# New faqs live in /docs/
3
+# moved to /docs/
4 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5
+RewriteRule ^bridges(.*) /docs/bridges$1 [R=301,L]
6
+RewriteRule ^abuse(.*) /docs/abuse$1 [R=301,L]
5 7
 
6 8
 # Torbutton
7 9
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
... ...
@@ -34,3 +36,4 @@ RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
34 36
 RewriteRule ^download/$ /download/download [R=301,L]
35 37
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
36 38
 RewriteRule ^easy-download(.*) /download/download$1 [R=301,L]
39
+
Browse code

Remove a spurious .html

Sebastian Hahn authored on20/10/2010 15:02:52
Showing1 changed files
... ...
@@ -33,4 +33,4 @@ RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
33 33
 # Download websites
34 34
 RewriteRule ^download/$ /download/download [R=301,L]
35 35
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
36
-RewriteRule ^easy-download(.*) /download/download.html$1 [R=301,L]
36
+RewriteRule ^easy-download(.*) /download/download$1 [R=301,L]
Browse code

download-easy shouldn't be used yet.

Andrew Lewman authored on20/10/2010 15:01:46
Showing1 changed files
... ...
@@ -33,4 +33,4 @@ RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
33 33
 # Download websites
34 34
 RewriteRule ^download/$ /download/download [R=301,L]
35 35
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
36
-RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
36
+RewriteRule ^easy-download(.*) /download/download.html$1 [R=301,L]
Browse code

Add a few new rewrite rules to capture more 404s.

Sebastian Hahn authored on20/10/2010 14:35:20
Showing1 changed files
... ...
@@ -8,6 +8,7 @@ RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
8 8
 
9 9
 # Tor Browser
10 10
 RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
11
+RewriteRule ^torbrowser/ /projects/torbrowser [R=301,L]
11 12
 RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L]
12 13
 
13 14
 # Overview
... ...
@@ -28,3 +29,8 @@ RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
28 29
 RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
29 30
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
30 31
 RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
32
+
33
+# Download websites
34
+RewriteRule ^download/$ /download/download [R=301,L]
35
+RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
36
+RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
Browse code

Add a redirect for the research site

Sebastian Hahn authored on18/10/2010 18:30:21
Showing1 changed files
... ...
@@ -1,6 +1,6 @@
1 1
 RewriteEngine On
2 2
 
3
-# New page lives in /docs/
3
+# New faqs live in /docs/
4 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 5
 
6 6
 # Torbutton
... ...
@@ -27,3 +27,4 @@ RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
27 27
 # GetInvolved
28 28
 RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
29 29
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
30
+RewriteRule ^research(.*) /getinvolved/research$1 [R=301,L]
Browse code

fix rewrite rules of stupidity.

Andrew Lewman authored on18/10/2010 06:41:56
Showing1 changed files
... ...
@@ -22,8 +22,8 @@ RewriteRule ^press/$ /press/press.html.en [R=301,L]
22 22
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
23 23
 
24 24
 # Projects
25
-RewriteRule ^/projects/$ /projects/projects.html.en [R=301,L]
25
+RewriteRule ^projects/$ /projects/projects.html.en [R=301,L]
26 26
 
27 27
 # GetInvolved
28
-RewriteRule ^/getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
28
+RewriteRule ^getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
29 29
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
Browse code

add two rewrites for the volunteer page.

Andrew Lewman authored on18/10/2010 06:33:38
Showing1 changed files
... ...
@@ -17,9 +17,13 @@ RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
17 17
 RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18 18
 RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
19 19
 
20
-# Press Page
20
+# Press
21 21
 RewriteRule ^press/$ /press/press.html.en [R=301,L]
22 22
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
23 23
 
24
-# Projects Page
24
+# Projects
25 25
 RewriteRule ^/projects/$ /projects/projects.html.en [R=301,L]
26
+
27
+# GetInvolved
28
+RewriteRule ^/getinvolved/$ /getinvolved/volunteer.html.en [R=301,L]
29
+RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]
Browse code

add a redirect for the projects/ page due to lack of index page.

Andrew Lewman authored on18/10/2010 06:26:43
Showing1 changed files
... ...
@@ -20,3 +20,6 @@ RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
20 20
 # Press Page
21 21
 RewriteRule ^press/$ /press/press.html.en [R=301,L]
22 22
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
23
+
24
+# Projects Page
25
+RewriteRule ^/projects/$ /projects/projects.html.en [R=301,L]
Browse code

try to catch just the press/ directory listing, rather than everything in that directory.

Andrew Lewman authored on17/10/2010 03:20:47
Showing1 changed files
... ...
@@ -18,5 +18,5 @@ RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18 18
 RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
19 19
 
20 20
 # Press Page
21
-RewriteRule ^press/ /press/press.html.en [R=301,L]
21
+RewriteRule ^press/$ /press/press.html.en [R=301,L]
22 22
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
Browse code

Vidalia is a single page, not a directory

Sebastian Hahn authored on17/10/2010 00:04:46
Showing1 changed files
... ...
@@ -15,7 +15,7 @@ RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
15 15
 
16 16
 # Vidalia
17 17
 RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18
-RewriteRule ^vidalia(.*) /projects/vidalia$1 [R=301,L]
18
+RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
19 19
 
20 20
 # Press Page
21 21
 RewriteRule ^press/ /press/press.html.en [R=301,L]
Browse code

Rewrite Rules shouldn't start with a /

Sebastian Hahn authored on17/10/2010 00:02:11
Showing1 changed files
... ...
@@ -7,16 +7,16 @@ RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
7 7
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
8 8
 
9 9
 # Tor Browser
10
-RewriteRule ^/torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
11
-RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
10
+RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
11
+RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L]
12 12
 
13 13
 # Overview
14
-RewriteRule ^/overview(.*) /about/overview$1 [R=301,L]
14
+RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
15 15
 
16 16
 # Vidalia
17
-RewriteRule ^/vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18
-RewriteRule ^/vidalia(.*) /projects/vidalia$1 [R=301,L]
17
+RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18
+RewriteRule ^vidalia(.*) /projects/vidalia$1 [R=301,L]
19 19
 
20 20
 # Press Page
21
-RewriteRule ^/press/ /press/press.html.en [R=301,L]
22
-RewriteRule ^/press/index.html(.*) /press/press.html$1 [R=301,L]
21
+RewriteRule ^press/ /press/press.html.en [R=301,L]
22
+RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
Browse code

Change the rewrite rules around a little Phobos should sanity-check

Sebastian Hahn authored on16/10/2010 23:59:41
Showing1 changed files
... ...
@@ -7,15 +7,15 @@ RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
7 7
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
8 8
 
9 9
 # Tor Browser
10
-RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
11 10
 RewriteRule ^/torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
11
+RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
12 12
 
13 13
 # Overview
14 14
 RewriteRule ^/overview(.*) /about/overview$1 [R=301,L]
15 15
 
16 16
 # Vidalia
17
-RewriteRule ^/vidalia/(.*) /projects/vidalia [R=301,L]
18 17
 RewriteRule ^/vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
18
+RewriteRule ^/vidalia(.*) /projects/vidalia$1 [R=301,L]
19 19
 
20 20
 # Press Page
21 21
 RewriteRule ^/press/ /press/press.html.en [R=301,L]
Browse code

catch the lack of index for /press/ with a rule. Fix ticket 2034.

Andrew Lewman authored on16/10/2010 20:56:35
Showing1 changed files
... ...
@@ -18,4 +18,5 @@ RewriteRule ^/vidalia/(.*) /projects/vidalia [R=301,L]
18 18
 RewriteRule ^/vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
19 19
 
20 20
 # Press Page
21
+RewriteRule ^/press/ /press/press.html.en [R=301,L]
21 22
 RewriteRule ^/press/index.html(.*) /press/press.html$1 [R=301,L]
Browse code

add in the dist/ dir moves for tbb and vidalia.

Andrew Lewman authored on16/10/2010 20:32:54
Showing1 changed files
... ...
@@ -8,9 +8,14 @@ RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
8 8
 
9 9
 # Tor Browser
10 10
 RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
11
+RewriteRule ^/torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L]
11 12
 
12 13
 # Overview
13 14
 RewriteRule ^/overview(.*) /about/overview$1 [R=301,L]
14 15
 
15 16
 # Vidalia
16 17
 RewriteRule ^/vidalia/(.*) /projects/vidalia [R=301,L]
18
+RewriteRule ^/vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
19
+
20
+# Press Page
21
+RewriteRule ^/press/index.html(.*) /press/press.html$1 [R=301,L]
Browse code

add in vidalia rewrite too

Andrew Lewman authored on16/10/2010 20:18:46
Showing1 changed files
... ...
@@ -11,3 +11,6 @@ RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
11 11
 
12 12
 # Overview
13 13
 RewriteRule ^/overview(.*) /about/overview$1 [R=301,L]
14
+
15
+# Vidalia
16
+RewriteRule ^/vidalia/(.*) /projects/vidalia [R=301,L]
Browse code

add two popular rewrites.

Andrew Lewman authored on16/10/2010 20:14:47
Showing1 changed files
... ...
@@ -5,3 +5,9 @@ RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 5
 
6 6
 # Torbutton
7 7
 RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
8
+
9
+# Tor Browser
10
+RewriteRule ^/torbrowser(.*) /projects/torbrowser$1 [R=301,L]
11
+
12
+# Overview
13
+RewriteRule ^/overview(.*) /about/overview$1 [R=301,L]
Browse code

Remove trailing slash

Sebastian Hahn authored on16/10/2010 15:42:45
Showing1 changed files
... ...
@@ -4,4 +4,4 @@ RewriteEngine On
4 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5 5
 
6 6
 # Torbutton
7
-RewriteRule ^torbutton/design(.*) /torbutton/en/design/$1 [R=301,L]
7
+RewriteRule ^torbutton/design(.*) /torbutton/en/design$1 [R=301,L]
Browse code

Add a rewrite rule for torbutton's design doc

Sebastian Hahn authored on16/10/2010 15:41:06
Showing1 changed files
... ...
@@ -1,2 +1,7 @@
1 1
 RewriteEngine On
2
+
3
+# New page lives in /docs/
2 4
 RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
5
+
6
+# Torbutton
7
+RewriteRule ^torbutton/design(.*) /torbutton/en/design/$1 [R=301,L]
Browse code

fix the rewrite rule so google, bing, yahoo don't punish us.

Andrew Lewman authored on15/10/2010 23:09:49
Showing1 changed files
... ...
@@ -1,2 +1,2 @@
1 1
 RewriteEngine On
2
-RewriteRule ^faq(.*) /docs/faq$1 [L,R]
2
+RewriteRule ^faq(.*) /docs/faq$1 [R=301,L]
Browse code

Start out a .htaccess for redirects, faq is first

Sebastian Hahn authored on15/10/2010 16:12:20
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,2 @@
1
+RewriteEngine On
2
+RewriteRule ^faq(.*) /docs/faq$1 [L,R]