summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2008-04-13 17:53:35 +0000
committermh <mh@immerda.ch>2008-04-13 17:53:35 +0000
commit61e9e8756180218bf262ab5cb35c31cb564af0f5 (patch)
tree529f66be5e5b40270e5ddf984a00478132bc99bb
parent37250569a91adad0f6468095f764bc6d9a2a74e3 (diff)
default vhost for centos
-rw-r--r--files/vhosts.d/00_default_centos_vhost.conf37
-rw-r--r--manifests/init.pp4
2 files changed, 39 insertions, 2 deletions
diff --git a/files/vhosts.d/00_default_centos_vhost.conf b/files/vhosts.d/00_default_centos_vhost.conf
new file mode 100644
index 0000000..b63640f
--- /dev/null
+++ b/files/vhosts.d/00_default_centos_vhost.conf
@@ -0,0 +1,37 @@
+# ###########################################################
+# # copyleft 2008 immerda.ch
+# ###########################################################
+# ### this file is managed by PUPPET ####
+# ### only modify in svn or you will loose the changes ! ####
+# ###########################################################
+
+<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 /e/certs/server.crt
+ SSLCertificateKeyFile /e/certs/server.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/manifests/init.pp b/manifests/init.pp
index e3b7332..0981172 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -77,6 +77,7 @@ class apache::centos inherits apache::base{
source => "puppet://$servername/apache/centos/ssl.conf",
owner => root, group => 0, mode => 0755;
}
+ apache::vhost::file { '00_default_centos_vhost': }
}
class apache::gentoo inherits apache::base {
@@ -155,8 +156,7 @@ define apache::vhost::file(
owner => root,
group => 0,
mode => 0644,
- require => File[$vhosts_dir],
- require => Package[apache],
+ require => [ File[$vhosts_dir], Package[apache] ],
notify => Service[apache],
}
}