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]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
2135141
..
2e8000b
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:
case $hostname {
ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer: