more redirects

diff --git a/dbd-autobuild/conf/dbd.conf b/dbd-autobuild/conf/dbd.conf
index a601ac959ada498985d610186a50c96eaaea44d5..81a6895a8d58c94e8dc317b5d6a957a87320cfba 100644 (file)
--- a/dbd-autobuild/conf/dbd.conf
+++ b/dbd-autobuild/conf/dbd.conf
@@ -55,21 +55,32 @@ ServerSignature On
 </IfModule>
 
 # <redirects/shortenings of URLs>
-Redirect ^/amazon-kindle-swindle\. /amazon-kindle-swindle
 Redirect /day http://www.defectivebydesign.org/dayagainstdrm/2019
 Redirect ^/dayagainstdrm/?$ http://www.defectivebydesign.org/dayagainstdrm/2019
 RedirectPermanent /node/9 /join
 RedirectPermanent /feed.xml /rss.xml
 
+# we can't seem to standardize on using underscores or hyphens, so we're going to use both
+# we can probably have apache use regex for this, I'll investigate that next
+# - Eostre, 2020-08-04
+Redirect ^/amazon-kindle-swindle\. /amazon-kindle-swindle
+Redirect ^/amazon_kindle_swindle\. /amazon-kindle-swindle
+Redirect ^/kindle-swindle\. /amazon-kindle-swindle
+Redirect ^/kindle_swindle\. /amazon-kindle-swindle
+
 # Cf. RT #716003. Ward, 2011-11-30
 RedirectPermanent /user/register https://crm.fsf.org/civicrm/profile/create?gid=36&reset=1
 
 # Cf. RT #839159. Ward, 2013-07-09
+RedirectPermanent /what-is-drm http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management
 RedirectPermanent /what_is_drm http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management
 
 #k054 RT #1044876 2015-09-09 
 RedirectPermanent /donate https://my.fsf.org/civicrm/contribute/transact?reset=1&id=40
 RedirectPermanent /no-drm-in-html5 https://my.fsf.org/civicrm/profile/create?gid=183&reset=1
+RedirectPermanent /no-drm-in-html-5 https://my.fsf.org/civicrm/profile/create?gid=183&reset=1
+RedirectPermanent /no_drm_in_html5 https://my.fsf.org/civicrm/profile/create?gid=183&reset=1
+RedirectPermanent /no_drm_in_html_5 https://my.fsf.org/civicrm/profile/create?gid=183&reset=1
 
 # broken links to /en/printable, etc
 # Ward, 2010-01-28