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

[mirror/dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 64e94db..9f849ff 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -22,7 +22,7 @@ module Puppet::Parser::Functions
     end
 
     if yaml.has_key?('services')
-      ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster'].each do |service|
+      ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster', 'packagesqamaster'].each do |service|
         if yaml['services'].has_key?(service)
           results[service] = host == yaml['services'][service]
         end
@@ -31,7 +31,7 @@ module Puppet::Parser::Functions
 
     results['mail_port']      = ''
     results['smarthost']      = ''
-    results['heavy_exim']     = ""
+    results['heavy_exim']     = ''
     results['smarthost_port'] = 587
     results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
 
@@ -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'] = []