X-Git-Url: https://vcs.fsf.org/?p=eostre.git;a=blobdiff_plain;f=dbd-autobuild%2Fconf%2Fdbd.conf;h=a601ac959ada498985d610186a50c96eaaea44d5;hp=8e73770eeeff2a23bca9aeaa823ada0e9ef0ae3b;hb=550cc3913531c0a7e310b1381c4b7e5ebbf2eb5d;hpb=b6e582d493eff0a008b0450f56aee692907df484
diff --git a/dbd-autobuild/conf/dbd.conf b/dbd-autobuild/conf/dbd.conf
index 8e73770..a601ac9 100644
--- a/dbd-autobuild/conf/dbd.conf
+++ b/dbd-autobuild/conf/dbd.conf
@@ -1,3 +1,4 @@
+#
ServerName www0.defectivebydesign.org
ServerAlias www.defectivebydesign.org
@@ -30,7 +31,16 @@
ServerName www.defectivebydesign.org
ServerAdmin webmaster@fsf.org
+#
+#
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+ServerSignature On
+#
+
+# if we have mod_status, use it
#
# Allow server status reports generated by mod_status,
@@ -44,64 +54,63 @@
- RedirectPermanent /node/9 http://www.defectivebydesign.org/join
- RedirectPermanent /feed.xml /rss.xml
-
- # 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
-
-
- #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
-
-
- Options FollowSymLinks
- AllowOverride None
-
- ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-
- AllowOverride None
- Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
- Require all granted
-
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/www.defectivebydesign.org-access.log combined
- ErrorLog /var/log/apache2/www.defectivebydesign.org-error.log
-
- ServerSignature On
-
- Alias /doc/ "/usr/share/doc/"
-
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
-
- Require host 127.0.0.0/255.0.0.0 ::1/128
-
-
-
- ExpiresActive On
- ExpiresDefault "access plus 1 month"
-
-
-
- ExpiresActive On
- ExpiresDefault "access plus 5 minutes"
-
-
- # broken links to /en/printable, etc
- # Ward, 2010-01-28
- RewriteRule ^/en/(.*) /$1 [R]
-
- RewriteRule ^/amazon-kindle-swindle\. /amazon-kindle-swindle [R]
-
-
+#
+Redirect ^/amazon-kindle-swindle\. /amazon-kindle-swindle
Redirect /day http://www.defectivebydesign.org/dayagainstdrm/2019
-RewriteRule ^/dayagainstdrm/?$ http://www.defectivebydesign.org/dayagainstdrm/2019
+Redirect ^/dayagainstdrm/?$ http://www.defectivebydesign.org/dayagainstdrm/2019
+RedirectPermanent /node/9 /join
+RedirectPermanent /feed.xml /rss.xml
+
+# 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
+
+#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
+
+# broken links to /en/printable, etc
+# Ward, 2010-01-28
+RewriteRule ^/en/(.*) /$1 [R]
+#
+
+#
+# I'm just an intern, fiddling with code written before I could `echo Hello World`
+# - Eostre, 2020-08-04
+
+ Options FollowSymLinks
+ AllowOverride None
+
+#
+
+#
+ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+
+ AllowOverride None
+ Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Require all granted
+
+#
+
+#
+Alias /doc/ "/usr/share/doc/"
+
+ Options Indexes MultiViews FollowSymLinks
+ AllowOverride None
+ Require host 127.0.0.0/255.0.0.0 ::1/128
+
+#
+
+#
+
+ ExpiresActive On
+ ExpiresDefault "access plus 1 month"
+
+
+
+ ExpiresActive On
+ ExpiresDefault "access plus 5 minutes"
+
+#