commented and rearranged dbd.conf, as well as merging in the old dbd-common.conf

diff --git a/dbd-autobuild/conf/dbd.conf b/dbd-autobuild/conf/dbd.conf
index 8e73770eeeff2a23bca9aeaa823ada0e9ef0ae3b..a601ac959ada498985d610186a50c96eaaea44d5 100644 (file)
--- a/dbd-autobuild/conf/dbd.conf
+++ b/dbd-autobuild/conf/dbd.conf
@@ -1,3 +1,4 @@
+# <aliases for dbd>
 <VirtualHost *:80>
        ServerName www0.defectivebydesign.org
        ServerAlias www.defectivebydesign.org
@@ -30,7 +31,16 @@
        ServerName www.defectivebydesign.org
        ServerAdmin webmaster@fsf.org
 </VirtualHost>
+# </aliases>
 
+# <configure some basic server parameters>
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+LogLevel warn
+ServerSignature On
+# </basic params>
+
+# if we have mod_status, use it
 <IfModule mod_status.c>
        #
        # Allow server status reports generated by mod_status,
@@ -44,64 +54,63 @@
        </Location>
 </IfModule>
 
-       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
-
-       <Directory />
-               Options FollowSymLinks
-               AllowOverride None
-       </Directory>
-       ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-       <Directory "/usr/lib/cgi-bin">
-               AllowOverride None
-               Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-               Require all granted
-       </Directory>
-
-       # 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/"
-    <Directory "/usr/share/doc/">
-        Options Indexes MultiViews FollowSymLinks
-        AllowOverride None
-       
-        Require host 127.0.0.0/255.0.0.0 ::1/128
-    </Directory>
-
-  <FilesMatch "\.(ico|pdf|jpe?g|png|gif|js|css)$">
-    ExpiresActive On
-    ExpiresDefault "access plus 1 month"
-  </FilesMatch>
-
-  <FilesMatch ".*">
-    ExpiresActive On
-    ExpiresDefault "access plus 5 minutes"
-  </FilesMatch>
-
-  # broken links to /en/printable, etc
-  # Ward, 2010-01-28
-  RewriteRule ^/en/(.*) /$1 [R]
-
-  RewriteRule ^/amazon-kindle-swindle\. /amazon-kindle-swindle [R]
-
-
+# <redirects/shortenings of URLs>
+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]
+# </redirects>
+
+# <I think this is for security? idk why we would be messing with / when our webroot is /var/www/html>
+# I'm just an intern, fiddling with code written before I could `echo Hello World`
+# - Eostre, 2020-08-04
+<Directory />
+       Options FollowSymLinks
+       AllowOverride None
+</Directory>
+# </weird stuff>
+
+# <add CGI scripts shipping by our distro>
+ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+<Directory "/usr/lib/cgi-bin">
+       AllowOverride None
+       Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+       Require all granted
+</Directory>
+# </cgi>
+
+# <allow us to access usr/share/doc over HTTP, but only from localhost, e.g. allow us to use an SSH tunnel to access it>
+Alias /doc/ "/usr/share/doc/"
+<Directory "/usr/share/doc/">
+       Options Indexes MultiViews FollowSymLinks
+       AllowOverride None
+       Require host 127.0.0.0/255.0.0.0 ::1/128
+</Directory>
+# </share/doc fuckery>
+
+# <manage caching: sets the Expires and Cache-Control headers so that clients know when to use their cache vs. when to refetch a resource>
+<FilesMatch "\.(ico|pdf|jpe?g|png|gif|js|css)$">
+       ExpiresActive On
+       ExpiresDefault "access plus 1 month"
+</FilesMatch>
+
+<FilesMatch ".*">
+       ExpiresActive On
+       ExpiresDefault "access plus 5 minutes"
+</FilesMatch>
+# </caching>