projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[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
84e5bc9
..
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')
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
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
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'] = []
ldap = LDAP::Conn.new('db.debian.org')
results['ldap'] = []