import old site configs

diff --git a/Makefile b/Makefile
index a71f48657e801ca1a91eb3119f95542863d408d8..d31b2d240976c4a9022e577cdaee667e5b0f5947 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,10 @@ install-from-backups: probe-backup-files install-sqldump install-drupal-sites ch
 probe-backup-files:
        [ -f /sqldump ]
        [ -f /sites && -d /sites ]
+#      [ -f /boycottsony.org.conf ]
+#      [ -f /dayagainstdrm.org.conf ]
+#      [ -f /rotten-apple.org.conf ]
+#      [ -f /defectivebydesign.org.conf ]
 
 install-sqldump:
        # source the dump twice - once to create the DB, once to populate it
@@ -46,6 +50,14 @@ install-drupal-sites:
        cd /var/www/html
        cp -r /sites sites
 
+#install-apache-sites-conf:
+#      cp /*.conf /etc/apache2/sites-available/
+#      a2ensite boycottsony.org
+#      a2ensite dayagainstdrm.org
+#      a2ensite rotten-apple.org
+#      a2ensite www.defectivebydesign.org
+#      systemctl reload apache2
+
 # recipes for building a chroot. notice that sql does not cooperate with chroots, due to some funky postinstall hooks and /proc namespaces conflicting
 build-chroot: new-chroot install-pkgs-in-chroot install-drupal-toolchain
 

diff --git a/files/boycottsony.org.conf b/files/boycottsony.org.conf
new file mode 100644 (file)
index 0000000..6956ce4
--- /dev/null
+++ b/files/boycottsony.org.conf
@@ -0,0 +1,20 @@
+<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/files/dayagainstdrm.org.conf b/files/dayagainstdrm.org.conf
new file mode 100644 (file)
index 0000000..5376514
--- /dev/null
+++ b/files/dayagainstdrm.org.conf
@@ -0,0 +1,30 @@
+<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/files/rotten-apple.org.conf b/files/rotten-apple.org.conf
new file mode 100644 (file)
index 0000000..3026037
--- /dev/null
+++ b/files/rotten-apple.org.conf
@@ -0,0 +1,21 @@
+<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/files/www.defectivebydesign.org.conf b/files/www.defectivebydesign.org.conf
new file mode 100644 (file)
index 0000000..0cfbc38
--- /dev/null
+++ b/files/www.defectivebydesign.org.conf
@@ -0,0 +1,50 @@
+<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>
+