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]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
89096a0
..
092f321
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-35,6
+35,9
@@
node default {
case $smartarraycontroller {
"true": { include debian-proliant }
}
case $smartarraycontroller {
"true": { include debian-proliant }
}
+ case $kvmdomain {
+ "true": { package { acpid: ensure => installed } }
+ }
case $mta {
"exim4": {
case $mta {
"exim4": {
@@
-68,7
+71,7
@@
node default {
}
case $hostname {
}
case $hostname {
- rietz,
raff,klecker
: { include named::secondary }
+ rietz,
klecker,ravel,senfl
: { include named::secondary }
}
case $hostname {
}
case $hostname {
@@
-78,6
+81,6
@@
node default {
"true": { include hosts }
}
case $hoster {
"true": { include hosts }
}
case $hoster {
- "ubcece", "darmstadt": { include resolv }
+ "ubcece", "darmstadt"
, "ftcollins"
: { include resolv }
}
}
}
}