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 3c0874e3a243b3abda18173ce0df1ef630e5338f..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':
@@ -22,19 +22,23 @@ class apache2 {
        }
 
        apache2::config { 'ressource-limits':
-               template => 'apache2/ressource-limits.erb',
+               content => template('apache2/ressource-limits.erb'),
        }
 
        apache2::config { 'security':
-               config => 'puppet:///modules/apache2/security',
+               source => 'puppet:///modules/apache2/security',
+       }
+
+       apache2::config { 'logformat-privacy':
+               source => 'puppet:///modules/apache2/logformat-privacy',
        }
 
        apache2::config { 'local-serverinfo':
-               config => 'puppet:///modules/apache2/local-serverinfo',
+               source => 'puppet:///modules/apache2/local-serverinfo',
        }
 
        apache2::config { 'server-status':
-               config => 'puppet:///modules/apache2/server-status',
+               source => 'puppet:///modules/apache2/server-status',
        }
 
        file { '/etc/apache2/sites-available/common-ssl.inc':
@@ -77,7 +81,7 @@ class apache2 {
                }
        }
 
-       if $::hostname in [busoni,duarte,holter,lindberg,master,powell,rore] {
+       if $::hostname in [busoni,holter,lindberg,master,beach,buxtehude,picconi] {
                include apache2::dynamic
        } else {
                @ferm::rule { 'dsa-http':