From ff8706e88ba450eb59624fcb018e5d242b52a450 Mon Sep 17 00:00:00 2001 From: eostre Date: Fri, 31 Jul 2020 15:51:53 -0400 Subject: [PATCH] delete old sites-enabled configs - we'll be rewriting them --- dbd-autobuild/files/boycottsony.org.conf | 20 --------- dbd-autobuild/files/dayagainstdrm.org.conf | 30 ------------- dbd-autobuild/files/rotten-apple.org.conf | 21 --------- dbd-autobuild/files/www.defectivebydesign.org.conf | 50 ---------------------- 4 files changed, 121 deletions(-) delete mode 100644 dbd-autobuild/files/boycottsony.org.conf delete mode 100644 dbd-autobuild/files/dayagainstdrm.org.conf delete mode 100644 dbd-autobuild/files/rotten-apple.org.conf delete mode 100644 dbd-autobuild/files/www.defectivebydesign.org.conf diff --git a/dbd-autobuild/files/boycottsony.org.conf b/dbd-autobuild/files/boycottsony.org.conf deleted file mode 100644 index 6956ce4..0000000 --- a/dbd-autobuild/files/boycottsony.org.conf +++ /dev/null @@ -1,20 +0,0 @@ - - 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] - - - - - ServerName boycottsony.org - ServerAlias www.boycottsony.org - - Redirect / https://www.defectivebydesign.org/sony/ - - Include /etc/apache2/sites-available/www.defectivebydesign.org-ssl-common.conf - - diff --git a/dbd-autobuild/files/dayagainstdrm.org.conf b/dbd-autobuild/files/dayagainstdrm.org.conf deleted file mode 100644 index 5376514..0000000 --- a/dbd-autobuild/files/dayagainstdrm.org.conf +++ /dev/null @@ -1,30 +0,0 @@ - - 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] - - - - - 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 - - - diff --git a/dbd-autobuild/files/rotten-apple.org.conf b/dbd-autobuild/files/rotten-apple.org.conf deleted file mode 100644 index 3026037..0000000 --- a/dbd-autobuild/files/rotten-apple.org.conf +++ /dev/null @@ -1,21 +0,0 @@ - - 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] - - - - - 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 - - diff --git a/dbd-autobuild/files/www.defectivebydesign.org.conf b/dbd-autobuild/files/www.defectivebydesign.org.conf deleted file mode 100644 index 0cfbc38..0000000 --- a/dbd-autobuild/files/www.defectivebydesign.org.conf +++ /dev/null @@ -1,50 +0,0 @@ - - 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] - - - - - 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 - - - - - 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 - - - -- 1.9.1