have apache2 example vhost snippets include snippet local-ssl from conf-available, and drop obsolete snippet conf.d/local-ssl.conf

11 files changed, 15 insertions, 40 deletions

diff --git a/apache2/conf.d/local-ssl.conf b/apache2/conf.d/local-ssl.conf
deleted file mode 100644
index 3626e25..0000000
--- a/apache2/conf.d/local-ssl.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SSLEngine on
-SSLCertificateFile /etc/ssl/certs/apache2.pem
-SSLCertificateKeyFile /etc/ssl/private/apache2.pem
-SSLCACertificatePath /etc/ssl/certs/
-#SSLCARevocationPath /etc/apache2/ssl.crl/
-#SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
-
-#SSLVerifyClient require
-#SSLVerifyDepth  10
-
-#SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-<FilesMatch "\.(cgi|shtml|phtml|php)$">
-	SSLOptions +StdEnvVars
-</FilesMatch>
-<Directory /usr/lib/cgi-bin>
-	SSLOptions +StdEnvVars
-</Directory>
-
-BrowserMatch "MSIE [2-6]" \
-	nokeepalive ssl-unclean-shutdown \
-	downgrade-1.0 force-response-1.0
-# MSIE 7 and newer should be able to use keepalive
-BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
-
-#CustomLog /var/log/apache2/ssl_request_log "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf
index 765cc8d..90216c7 100644
--- a/apache2/sites-available/0_default.conf
+++ b/apache2/sites-available/0_default.conf
@@ -11,7 +11,7 @@ Define _TLS_KEY /etc/ssl/private/ssl-cert-snakeoil.key
 <VirtualHost _default_:443>
 	DocumentRoot /var/www/html
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
diff --git a/apache2/sites-available/chat.secure-example.com.conf b/apache2/sites-available/chat.secure-example.com.conf
index 7c1c018..2eb69d4 100644
--- a/apache2/sites-available/chat.secure-example.com.conf
+++ b/apache2/sites-available/chat.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /var/www/vhosts/web-static/chat.example.com/
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 	Include conf.d/javascript-common.conf
 	Include conf.d/local-jabber.conf
 
@@ -30,7 +30,7 @@
 	ServerName chat:443
 	ServerName *.chat:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / https://chat.example.com/[R]
diff --git a/apache2/sites-available/django.secure-example.com.conf b/apache2/sites-available/django.secure-example.com.conf
index e9200d9..9a7db14 100644
--- a/apache2/sites-available/django.secure-example.com.conf
+++ b/apache2/sites-available/django.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /var/www/nowhere
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	<Location />
 		SetHandler uwsgi-handler
diff --git a/apache2/sites-available/issues.secure-example.com.conf b/apache2/sites-available/issues.secure-example.com.conf
index 2434e0c..361218d 100644
--- a/apache2/sites-available/issues.secure-example.com.conf
+++ b/apache2/sites-available/issues.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /var/www/nowhere
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	<Location />
 		SetHandler uwsgi-handler
diff --git a/apache2/sites-available/lists.secure-example.com.conf b/apache2/sites-available/lists.secure-example.com.conf
index 8097b55..23391ee 100644
--- a/apache2/sites-available/lists.secure-example.com.conf
+++ b/apache2/sites-available/lists.secure-example.com.conf
@@ -4,7 +4,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /home/webmaster/public_websites/lists.example.com/
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 	Include conf.d/local-log-vhosts.conf
 	Include conf.d/local-mailman.conf
 	Include conf.d/local-mailman-root.conf
@@ -16,7 +16,7 @@
 	ServerName www.lists.example.com:443
 	ServerName *.lists.example.com:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / https://lists.example.com/ [R]
diff --git a/apache2/sites-available/mail.secure-example.com.conf b/apache2/sites-available/mail.secure-example.com.conf
index dd25302..1dd3dd8 100644
--- a/apache2/sites-available/mail.secure-example.com.conf
+++ b/apache2/sites-available/mail.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /home/webmaster/public_websites/mail.example.com/
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 	Include conf.d/local-php.conf
 	Include conf.d/local-horde3.conf
 
@@ -16,7 +16,7 @@
 	ServerName mail:443
 	ServerName *.mail:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / https://mail.example.com/ [R]
diff --git a/apache2/sites-available/users.secure-example.com.conf b/apache2/sites-available/users.secure-example.com.conf
index d251928..2f83096 100644
--- a/apache2/sites-available/users.secure-example.com.conf
+++ b/apache2/sites-available/users.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /var/www/vhosts/web-static/users.example.com/
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 #	Include conf.d/local-userdir.conf
 #	Include conf.d/local-macvolumes.conf
 
@@ -51,7 +51,7 @@
 	ServerName users:443
 	ServerName *.users:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / https://users.example.com/[R]
diff --git a/apache2/sites-available/www.secure-example.com.conf b/apache2/sites-available/www.secure-example.com.conf
index 7ddd913..cb6325d 100644
--- a/apache2/sites-available/www.secure-example.com.conf
+++ b/apache2/sites-available/www.secure-example.com.conf
@@ -23,7 +23,7 @@
 	ServerName www:443
 	ServerName *.www:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / http://www.example.com/ [R]
diff --git a/apache2/sites-available/zzz_wrong.example.com.conf b/apache2/sites-available/zzz_wrong.example.com.conf
index 2757fb9..36dc14d 100644
--- a/apache2/sites-available/zzz_wrong.example.com.conf
+++ b/apache2/sites-available/zzz_wrong.example.com.conf
@@ -12,7 +12,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /home/webmaster/public_websites/wrong.example.com
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log
 	CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined
diff --git a/moin/apache2/sites-available/wiki.secure-example.com.conf b/moin/apache2/sites-available/wiki.secure-example.com.conf
index d369624..6fba40b 100644
--- a/moin/apache2/sites-available/wiki.secure-example.com.conf
+++ b/moin/apache2/sites-available/wiki.secure-example.com.conf
@@ -3,7 +3,7 @@
 	ServerAdmin webmaster@example.com
 	DocumentRoot /usr/share/moin/htdocs
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	<Location />
 		SetHandler uwsgi-handler
@@ -18,7 +18,7 @@
 	ServerName wiki:443
 	ServerName *.wiki:443
 
-	Include conf.d/local-ssl.conf
+	Include conf-available/local-ssl.conf
 
 	RewriteEngine On
 	RewriteRule / https://wiki.example.com/ [R]