move info on whether to install apache2 default config from manifest to nodeinfo...

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index e9c81327ad188ed7be13361f7230b371735207e8..9f849ffb2cc9a12b6ddce515222e3d65c924d2b4 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 21351416a3aecadd9f6be967c6001ba129901b50..2e8000b060e8dd2786672563a8868c12e2eb25a8 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/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8dcf193c869d19ba8463b989990a9ab3fc4ffee0..62b615afbdb3656f2f786234265a32871a62e68b 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -80,6 +80,14 @@ 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
+  - samosa.debian.org
+  - tartini.debian.org
 services:
   bugsmaster: rietz.debian.org
   qamaster: merkel.debian.org