5 files changed, 16 insertions, 15 deletions
diff --git a/apache2/sites-available/00_virtual.conf b/apache2/sites-available/000-before-default.conf
index 2dc37fb..2dc37fb 100644
--- a/apache2/sites-available/00_virtual.conf
+++ b/apache2/sites-available/000-before-default.conf
diff --git a/apache2/sites-available/000-before-tls-default.conf b/apache2/sites-available/000-before-tls-default.conf
new file mode 100644
index 0000000..206bbb2
--- /dev/null
+++ b/apache2/sites-available/000-before-tls-default.conf
@@ -0,0 +1,4 @@
+#Define _HOST example.org
+#Define _TLS_HOST example.org
+Define _TLS_CERT_CHAIN /etc/ssl/certs/ssl-cert-snakeoil.pem
+Define _TLS_KEY /etc/ssl/private/ssl-cert-snakeoil.key
diff --git a/apache2/sites-available/000-tls-default.conf b/apache2/sites-available/000-tls-default.conf
new file mode 100644
index 0000000..b6fbad3
--- /dev/null
+++ b/apache2/sites-available/000-tls-default.conf
@@ -0,0 +1,8 @@
+<VirtualHost *:443>
+	DocumentRoot /var/www/html
+
+	Include conf-available/local-tls.conf
+
+	ErrorLog ${APACHE_LOG_DIR}/error.log
+	CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
diff --git a/apache2/sites-available/000-zzz.conf b/apache2/sites-available/000-zzz.conf
new file mode 100644
index 0000000..78bcdbc
--- /dev/null
+++ b/apache2/sites-available/000-zzz.conf
@@ -0,0 +1,4 @@
+#Undefine _HOST
+#Undefine _TLS_HOST
+Undefine _TLS_CERT_CHAIN
+Undefine _TLS_KEY
diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf
deleted file mode 100644
index c67729f..0000000
--- a/apache2/sites-available/0_default.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-<VirtualHost _default_:80>
-	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www/html
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
-<VirtualHost _default_:443>
-	DocumentRoot /var/www/html
-
-	Include conf-available/local-tls.conf
-
-	ErrorLog ${APACHE_LOG_DIR}/error.log
-	CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>