[tor-commits] [tpo/staging] Remove htaccess-membership

[hiro at torproject.org]

commit c66efabb7bd2f2673fbbf5525f5ff934c0863a07
Author: hiro <hiro at torproject.org>
Date:   Sun Sep 27 19:11:17 2020 +0200

    Remove htaccess-membership
    Clean up htaccess and add rules for donate campaign 2020
---
 .htaccess            | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++
 .htaccess-membership |   4 -
 2 files changed, 241 insertions(+), 4 deletions(-)

diff --git a/.htaccess b/.htaccess
index 81a71ca6..1f35b8f7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -116,3 +116,244 @@ RewriteRule ^thankyou(.*) https://donate.torproject.org/thank-you [R=302,L]
 # 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]
+
+# Donation campaign
+# 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
diff --git a/.htaccess-membership b/.htaccess-membership
deleted file mode 100644
index 64537967..00000000
--- a/.htaccess-membership
+++ /dev/null
@@ -1,4 +0,0 @@
-AuthType Basic
- AuthName "Secure Content"
- AuthUserFile .htpasswd
- require valid-user