commit c56147f2115367c10d1d08e6e44f2c2c5ef49685 Author: hiro hiro@torproject.org Date: Sun Sep 27 19:16:01 2020 +0200
Edit htaccess --- .htaccess | 293 +++++++++++--------------------------------------------------- 1 file changed, 50 insertions(+), 243 deletions(-)
diff --git a/.htaccess b/.htaccess index 1f35b8f7..9f26ed62 100644 --- a/.htaccess +++ b/.htaccess @@ -70,10 +70,6 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L]
-# Donation campaign -# 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] - # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=302,L] @@ -100,12 +96,9 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L] # Videos RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L]
- # Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected -RewriteRule ^donate/donate-options(.*) https://2019.www.torproject.org/donate/donate-options$1 [END] -RewriteRule ^donate/donate-amazon(.*) https://2019.www.torproject.org/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] @@ -121,239 +114,53 @@ RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] # 2020 RewriteRule ^donate/donate-usetor-bp1(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-usetor-twitter-en(.*) https://donate.torproject.org/ [R=302,L] -Clicked on a tweet generated by the thank you page tweet intent button -donate.torproject.org - - -/donate/donate-ann-usetor-tw -Twitter -donate.torproject.org - - -/donate/donate-ann-usetor-tw-en -Twitter announcement -donate.torproject.org - - -/donate/donate-ann-usetor-fb -Facebook announcement -donate.torproject.org - - -/donate/donate-usetor-blog -generic blog post -donate.torproject.org - - -/donate/donate-hrd-usetor-tw -blog post HR Day twitter -donate.torproject.org - - -/donate/donate-usetor-hp1 -torproject.org homepage banner -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-fb -Facebook posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-md -Mastodon posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-tw -Twitter posts -donate.torproject.org - - -/donate/donate-twitter -Twitter -donate.torproject.org - - -https://torproject.org/donate/donate-usertor-ld -LinkedIn posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-ig -Instagram posts -donate.torproject.org - - -/donate/donate-usetor-tn1 -Tor Newsletter -donate.torproject.org - - -/donate/donate-usetor-yt -YouTube posts -donate.torproject.org - - -/donate/donate-usetor-em1 -Announcement email -donate.torproject.org - - -/donate/donate-usetor-gp -Google Play -donate.torproject.org - -/donate/en -En locale -donate.torproject.org - - -/donate/ru -Ru locale -donate.torproject.org - - -/donate/es -Es locale -donate.torproject.org/es - - -/donate/donate.html -- -donate.torproject.org - - -/donate/donate-download.html.en -- -donate.torproject.org - - -/donate/donate.html.en -- -donate.torproject.org - - -/donate/donate-amazon.html.en -- -donate.torproject.org - - -/donate/donate-button.html.en -- -donate.torproject.org - - -/donate/donate-foot.html.en -- -donate.torproject.org - - -/donate/donate-options.html.en -- -donate.torproject.org - - -/donate/donate-download.html -- -donate.torproject.org - - -/donate/ -- -donate.torproject.org - - -/donate/donate-button.html -- -donate.torproject.org - -/donate/donate-usetor-en-US -about:tor donate button (english) (TBB) - - -/donate/donate-usetor-ru -about:tor donate button (Russian) (TBB) - - -/donate/donate-usetor-de -about:tor donate button (German) (TBB) - - -/donate/donate-usetor-fr -about:tor donate button (French) (TBB) - - -/donate/donate-usetor-zh-CN -about:tor donate button (Cantonese) (TBB) - - -/donate/donate-usetor-es-ES -about:tor donate button (Spanish) (TBB) - - -/donate/donate-usetor-ja -about:tor donate button (Japanese) (TBB) - - -/donate/donate-usetor-it -about:tor donate button (Italian) (TBB) - - -/donate/donate-usetor-pt-BR -about:tor donate button (Portuguese) (TBB) - - -/donate/donate-usetor-tr -about:tor donate button (Turkish) (TBB) - - -/donate/donate-usetor-ar -about:tor donate button (Arabic) (TBB) - - -/donate/donate-usetor-pl -about:tor donate button (Polish) (TBB) - - -/donate/donate-usetor-mobile-default -about:tor donate button (english) (TBA) - - -/donate/donate-usetor-mobile- -- - - -/donate/donate-tba-tb2/donate/donate-usetor-mobile- -about:tor donate button (language2) (TBA) - - -/donate/donate-usetor-mobile-ru -about:tor donate button (language3) (TBA) - - -/donate/donate-tba-tb4 -about:tor donate button (language4) (TBA) - - -/donate/donate-tba-tb5 -about:tor donate button (language5) (TBA) - - -/donate/donate-tba-tb6 -about:tor donate button (language6) (TBA) - - -/donate/donate-tba-tb7 -about:tor donate button (language7) (TBA) - - -/donate/donate-tba-tb8 -about:tor donate button (language8) (TBA) - - -/donate/donate-tba-tb9 -about:tor donate button (language10) (TBA) - - -/donate/donate-tba-tb10 +RewriteRule ^donate/donate-ann-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-tw-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-blog(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-hrd-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-hp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-twitter(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usertor-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tn1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-yt(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/es(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-amazon(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-options(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-en-US(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-de(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-zh-CN(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-es-ES(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ja(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-it(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pt-BR(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ar(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pl(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-default(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb2/donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb4(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb5(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb6(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb7(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb8(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L]