fix use conf snippet local-tls (not local-ssl)

10 files changed, 15 insertions, 15 deletions

diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf
index 9ab8c5d..bf80e59 100644
--- a/apache2/sites-available/0_default.conf
+++ b/apache2/sites-available/0_default.conf
@@ -12,7 +12,7 @@ Define _TLS_KEY /etc/ssl/private/ssl-cert-snakeoil.key
 <VirtualHost _default_:443>
 	DocumentRoot /var/www/html
 
-	Include conf-available/local-ssl.conf
+	Include conf-available/local-tls.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 2eb69d4..dcfbb5c 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-available/local-ssl.conf
+	Include conf-available/local-tls.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-available/local-ssl.conf
+	Include conf-available/local-tls.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 9a7db14..7ff403d 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-available/local-ssl.conf
+	Include conf-available/local-tls.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 361218d..abc5364 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-available/local-ssl.conf
+	Include conf-available/local-tls.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 23391ee..d9c17fa 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-available/local-ssl.conf
+	Include conf-available/local-tls.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-available/local-ssl.conf
+	Include conf-available/local-tls.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 1dd3dd8..edf223f 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-available/local-ssl.conf
+	Include conf-available/local-tls.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-available/local-ssl.conf
+	Include conf-available/local-tls.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 2f83096..79fb23e 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-available/local-ssl.conf
+	Include conf-available/local-tls.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-available/local-ssl.conf
+	Include conf-available/local-tls.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 cb6325d..4f7928b 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-available/local-ssl.conf
+	Include conf-available/local-tls.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 36dc14d..467f666 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-available/local-ssl.conf
+	Include conf-available/local-tls.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 6fba40b..d729422 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-available/local-ssl.conf
+	Include conf-available/local-tls.conf
 
 	<Location />
 		SetHandler uwsgi-handler
@@ -18,7 +18,7 @@
 	ServerName wiki:443
 	ServerName *.wiki:443
 
-	Include conf-available/local-ssl.conf
+	Include conf-available/local-tls.conf
 
 	RewriteEngine On
 	RewriteRule / https://wiki.example.com/ [R]