From 2d6439256d63098ec2449050833f893dd925ccde Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 23 Apr 2013 19:14:13 +0200
Subject: [PATCH] updated apache config

---
 misc/apache-vhost.conf | 83 ++++++++++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/misc/apache-vhost.conf b/misc/apache-vhost.conf
index 2c740dc..c059774 100644
--- a/misc/apache-vhost.conf
+++ b/misc/apache-vhost.conf
@@ -1,36 +1,57 @@
 <VirtualHost *:80>
-        ServerAdmin webmaster@0l.de
-        ServerName d.0l.de
-        ServerAlias d.eta.li *.d.eta.li *.0l.de members.dyndns.org
+	ServerAdmin webmaster@0l.de
+	ServerName d.0l.de
+	ServerAlias *.0l.de
 
-        DocumentRoot /var/www/nulll/sddns/
-        <Directory />
-                Options FollowSymLinks
-                AllowOverride None
-        </Directory>
-        <Directory /var/www/nulll/sddns/>
-                Options Indexes FollowSymLinks MultiViews
-                AllowOverride all
-                Order allow,deny
-                allow from all
-        </Directory>
+	DocumentRoot /var/www/nulll/sddns/
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/nulll/sddns/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride all
+		Order allow,deny
+		allow from all
+	</Directory>
+	
+	ErrorLog ${APACHE_LOG_DIR}/error_sddns.log
 
-        Alias /nic/update /var/www/nulll/sddns/update.php
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
 
-        ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-        <Directory /usr/lib/cgi-bin/>
-                AllowOverride None
-                Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
-                Order allow,deny
-                Allow from all
-        </Directory>
-
-        ErrorLog /var/log/apache2/error_sddns.log
-
-        # Possible values include: debug, info, notice, warn, error, crit,
-        # alert, emerg.
-        LogLevel warn
-
-        CustomLog /var/log/apache2/access_sddns.log combined
-        ServerSignature On
+	CustomLog ${APACHE_LOG_DIR}/access_sddns.log combined
+	ServerSignature On
 </VirtualHost>
+
+<IfModule mod_ssl.c>
+<VirtualHost *:443>
+	ServerAdmin webmaster@0l.de
+	ServerName d.0l.de
+	ServerAlias *.0l.de
+
+	DocumentRoot /var/www/nulll/sddns/
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/nulll/sddns/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride all
+		Order allow,deny
+		allow from all
+	</Directory>
+	
+	ErrorLog ${APACHE_LOG_DIR}/error_sddns.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog ${APACHE_LOG_DIR}/access_sddns.log combined
+	ServerSignature On
+
+	Include ssl_virtual.conf
+</VirtualHost>
+</IfModule>