pick up some other useful rules

[dsa-puppet.git] / modules / apache2 / manifests / init.pp

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 082b8631ccf5252eeab193e18c66271be3fa35b9..492823da248edd2fc6316fba32c3c63b7a8008e0 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -14,7 +14,7 @@ class apache2 {
 
        apache2::site { '00-default':
                site     => 'default-debian.org',
-               template => 'apache2/default-debian.org.erb',
+               content  => template('apache2/default-debian.org.erb'),
        }
 
        apache2::site { '000-default':
@@ -29,6 +29,10 @@ class apache2 {
                source => 'puppet:///modules/apache2/security',
        }
 
+       apache2::config { 'logformat-privacy':
+               source => 'puppet:///modules/apache2/logformat-privacy',
+       }
+
        apache2::config { 'local-serverinfo':
                source => 'puppet:///modules/apache2/local-serverinfo',
        }
@@ -77,7 +81,7 @@ class apache2 {
                }
        }
 
-       if $::hostname in [busoni,duarte,holter,lindberg,master,powell] {
+       if $::hostname in [busoni,holter,lindberg,master,beach,buxtehude,picconi] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':