merged with puzzle

6 files changed, 26 insertions, 43 deletions

diff --git a/files/vhosts.d/00_default_centos_vhost.conf b/files/vhosts.d/00_default_centos_vhost.conf
deleted file mode 100644
index 315fa13..0000000
--- a/files/vhosts.d/00_default_centos_vhost.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# ###########################################################
-# # copyleft 2008 immerda.ch
-# ###########################################################
-# ### this file is managed by PUPPET                     ####
-# ### only modify in svn or you will loose the changes ! ####
-# ###########################################################
-
-NameVirtualHost *:80
-
-<VirtualHost *:80>
-	DocumentRoot /var/www/html
-
-    RewriteEngine on
-      RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-      RewriteRule .* - [F]
-    ServerSignature Off
-</VirtualHost>
-
-<VirtualHost _default_:443>
-	DocumentRoot /var/www/html
-
-	SSLEngine on
-
-    SSLCipherSuite HIGH:MEDIUM:!ADH:-SSLv2
- 
-    SSLCertificateFile /etc/pki/tls/certs/localhost.crt
-    SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
-    <Files ~ "\.(cgi|shtml|phtml|php3?)$">
-        SSLOptions +StdEnvVars
-    </Files>
-
-    RewriteEngine on
-      RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)
-      RewriteRule .* - [F]
-    ServerSignature Off
-
-</VirtualHost>
-
-# vim: ts=4 filetype=apache
diff --git a/files/vhosts.d/CentOS/0-default.conf b/files/vhosts.d/CentOS/0-default.conf
new file mode 100644
index 0000000..b908b43
--- /dev/null
+++ b/files/vhosts.d/CentOS/0-default.conf
@@ -0,0 +1,11 @@
+############################################################
+### This file is managed by PUPPET!                     ####
+### Only modify in repo or you will loose the changes!  ####
+############################################################
+
+<VirtualHost *:80>
+    Include conf.d/defaults.inc
+    DocumentRoot /var/www/html
+</VirtualHost>
+
+# vim: ts=4 filetype=apache
diff --git a/files/vhosts.d/CentOS/0-default_ssl.conf b/files/vhosts.d/CentOS/0-default_ssl.conf
new file mode 100644
index 0000000..85860f0
--- /dev/null
+++ b/files/vhosts.d/CentOS/0-default_ssl.conf
@@ -0,0 +1,15 @@
+############################################################
+### This file is managed by PUPPET!                     ####
+### Only modify in repo or you will loose the changes!  ####
+############################################################
+
+<VirtualHost *:443>
+    Include conf.d/defaults.inc
+    Include conf.d/ssl_defaults.inc
+    DocumentRoot /var/www/html
+
+    SSLCertificateFile /etc/pki/tls/certs/localhost.crt
+    SSLCertificateKeyFile /etc/pki/tls/private/localhost.key
+</VirtualHost>
+
+# vim: ts=4 filetype=apache
diff --git a/files/vhosts.d/00_default_ssl_vhost.conf b/files/vhosts.d/Gentoo/00_default_ssl_vhost.conf
index a92a1b2..7efe879 100644
--- a/files/vhosts.d/00_default_ssl_vhost.conf
+++ b/files/vhosts.d/Gentoo/00_default_ssl_vhost.conf
@@ -1,5 +1,3 @@
-###########################################################
-## copyleft 2008 immerda.ch
 ############################################################
 #### this file is managed by PUPPET                     ####
 #### only modify in svn or you will loose the changes ! ####
diff --git a/files/vhosts.d/00_default_vhost.conf b/files/vhosts.d/Gentoo/00_default_vhost.conf
index edd1074..0346845 100644
--- a/files/vhosts.d/00_default_vhost.conf
+++ b/files/vhosts.d/Gentoo/00_default_vhost.conf
@@ -1,6 +1,4 @@
 # ###########################################################
-# # copyleft 2008 immerda.ch
-# ###########################################################
 # ### this file is managed by PUPPET                     ####
 # ### only modify in svn or you will loose the changes ! ####
 # ###########################################################
diff --git a/files/vhosts.d/default_vhost.include b/files/vhosts.d/Gentoo/default_vhost.include
index 590c184..590c184 100644
--- a/files/vhosts.d/default_vhost.include
+++ b/files/vhosts.d/Gentoo/default_vhost.include