X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=9f849ffb2cc9a12b6ddce515222e3d65c924d2b4;hb=e216061f35961159f2dbac3f4268f6acedc66c67;hp=84e5bc9960b8c96bf95fd62a25357805203fb627;hpb=594431cf80a3a56cda904228f36bd236d9606ab5;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 84e5bc996..9f849ffb2 100644
--- 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
@@ -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'] = []