delete old sites-enabled configs - we'll be rewriting them

diff --git a/dbd-autobuild/files/boycottsony.org.conf b/dbd-autobuild/files/boycottsony.org.conf
deleted file mode 100644 (file)
index 6956ce4..0000000
--- a/dbd-autobuild/files/boycottsony.org.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<VirtualHost *:80>
-       ServerName boycottsony.org
-       ServerAlias www.boycottsony.org
-
-  ### redirect to same domain name, but HTTPS. required for HSTS  
-  RewriteEngine On
-  RewriteCond %{HTTPS} !=on
-  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerName boycottsony.org
-       ServerAlias www.boycottsony.org
-
-       Redirect / https://www.defectivebydesign.org/sony/
-
-  Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf
-
-</VirtualHost>

diff --git a/dbd-autobuild/files/dayagainstdrm.org.conf b/dbd-autobuild/files/dayagainstdrm.org.conf
deleted file mode 100644 (file)
index 5376514..0000000
--- a/dbd-autobuild/files/dayagainstdrm.org.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-<VirtualHost *:80>
-  ServerName dayagainstdrm.org
-  ServerAlias www.dayagainstdrm.org
-
-  ### redirect to same domain name, but HTTPS. required for HSTS  
-  RewriteEngine On
-  RewriteCond %{HTTPS} !=on
-  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerName dayagainstdrm.org
-       ServerAlias www.dayagainstdrm.org
-       ServerAdmin webmaster@fsf.org
-
-  Header set Access-Control-Allow-Origin "my.fsf.org"
-
-  RewriteEngine On
-
-  RewriteRule ^/$ https://defectivebydesign.org/dayagainstdrm
-  RewriteRule ^/2016$ https://www.defectivebydesign.org/dayagainstdrm/2016
-  RewriteRule ^/2017$ https://www.defectivebydesign.org/dayagainstdrm/2017
-  RewriteRule ^/2018$ https://www.defectivebydesign.org/dayagainstdrm/2018
-  RewriteRule ^/2019$ https://www.defectivebydesign.org/dayagainstdrm/2019
-
-  Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf
-
-</VirtualHost>
-

diff --git a/dbd-autobuild/files/rotten-apple.org.conf b/dbd-autobuild/files/rotten-apple.org.conf
deleted file mode 100644 (file)
index 3026037..0000000
--- a/dbd-autobuild/files/rotten-apple.org.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<VirtualHost *:80>
-       ServerName rotten-apple.org
-       ServerAlias www.rotten-apple.org
-
-  ### redirect to same domain name, but HTTPS. required for HSTS  
-  RewriteEngine On
-  RewriteCond %{HTTPS} !=on
-  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-</VirtualHost>
-
-<VirtualHost *:443>
-       ServerName rotten-apple.org
-       ServerAlias www.rotten-apple.org
-
-       #Redirect / https://www.defectivebydesign.org/apple
-  Redirect / https://www.fsf.org/campaigns/apple-patents
-
-  Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf
-
-</VirtualHost>

diff --git a/dbd-autobuild/files/www.defectivebydesign.org.conf b/dbd-autobuild/files/www.defectivebydesign.org.conf
deleted file mode 100644 (file)
index 0cfbc38..0000000
--- a/dbd-autobuild/files/www.defectivebydesign.org.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-<VirtualHost *:80>
-  ServerName www0.defectivebydesign.org
-  ServerAlias www.defectivebydesign.org
-  ServerAlias defectivebydesign.com
-  ServerAlias defectivebydesign.net
-  ServerAlias www.defectivebydesign.com
-  ServerAlias www.defectivebydesign.net
-  ServerAlias dbd.fsf.org
-  #ServerAlias dbd.gnu.org
-  #ServerAlias www.stopdrm.org
-  #ServerAlias stopdrm.org
-  ServerAlias defectivebydesign.org
-  ServerAdmin webmaster@fsf.org
-  
-  ### redirect to same domain name, but HTTPS. required for HSTS  
-  RewriteEngine On
-  RewriteCond %{HTTPS} !=on
-  RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
-
-</VirtualHost>
-
-<VirtualHost *:443>
-  ServerName www0.defectivebydesign.org
-  ServerAlias defectivebydesign.com
-  ServerAlias defectivebydesign.net
-  ServerAlias www.defectivebydesign.com
-  ServerAlias www.defectivebydesign.net
-  ServerAlias dbd.fsf.org
-  #ServerAlias dbd.gnu.org
-  #ServerAlias www.stopdrm.org
-  #ServerAlias stopdrm.org
-  ServerAlias defectivebydesign.org
-  ServerAdmin webmaster@fsf.org
-
-  Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf
-
-  RedirectMatch permanent (.*) https://www.defectivebydesign.org$1
-
-</VirtualHost>
-
-<VirtualHost *:443>
-  ServerName www.defectivebydesign.org
-  ServerAdmin webmaster@fsf.org
-
-  Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf
-
-  Include /etc/apache2/sites-available/dbd-common.conf
-
-</VirtualHost>
-