Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index e9c8132..9f849ff 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -51,6 +51,10 @@ module Puppet::Parser::Functions
       results['heavy_exim']    = "true"
     end
 
+    if yaml.has_key?('apache2_defaultconfig') and yaml['apache2_defaultconfig'].include?(host)
+      results['apache2_defaultconfig']    = "true"
+    end
+
     ldap = LDAP::Conn.new('db.debian.org')
 
     results['ldap'] = []

diff --git a/manifests/site.pp b/manifests/site.pp
index 2135141..2e8000b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -50,13 +50,10 @@ node default {
        }
     }
 
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,draghi,tartini,samosa,duarte,piatti:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
+     case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+          "true":  { include apache2 }
+           default: { }
+     }
 
     case $hostname {
         ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 3a7efd2..2975304 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -1,6 +1,7 @@
 class apache2 {
        package {
                apache2: ensure => installed;
+               logrotate: ensure => installed;
        }
 
        file {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8dcf193..c40d45f 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -80,6 +80,15 @@ heavy_exim:
   - rietz.debian.org
   - klecker.debian.org
   - powell.debian.org
+apache2_defaultconfig:
+  - carver.debian.org
+  - draghi.debian.org
+  - duarte.debian.org
+  - piatti.debian.org
+  - rore.debian.org
+  - saens.debian.org
+  - samosa.debian.org
+  - tartini.debian.org
 services:
   bugsmaster: rietz.debian.org
   qamaster: merkel.debian.org