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 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
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'] = []