projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
put my home subnets in, instead of single ips
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
d5b6ab6
..
fb85a46
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-21,6
+21,7
@@
node default {
$mxinfo = allnodeinfo("mXRecord")
$mxinfo = allnodeinfo("mXRecord")
+ include ferm
include munin-node
include sudo
include ssh
include munin-node
include sudo
include ssh
@@
-35,6
+36,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": {
@@
-47,6
+51,11
@@
node default {
case $hostname {
spohr: {
case $hostname {
spohr: {
+ include munin-node::master
+ }
+ }
+ case $hostname {
+ tchaikovsky: {
include nagios::server
}
default: {
include nagios::server
}
default: {
@@
-67,11
+76,13
@@
node default {
"true": { include buildd }
}
"true": { include buildd }
}
-# maybe wait for rietz to be upgraded to lenny
case $hostname {
case $hostname {
-
rietz,raff,klecker
: { include named::secondary }
+
klecker,ravel,senfl,orff
: { include named::secondary }
}
}
+ case $hostname {
+ logtest01: { include ferm::real }
+ }
case $hostname {
geo1,geo2,geo3: { include named::geodns }
}
case $hostname {
geo1,geo2,geo3: { include named::geodns }
}
@@
-79,6
+90,6
@@
node default {
"true": { include hosts }
}
case $hoster {
"true": { include hosts }
}
case $hoster {
- "ubcece", "darmstadt": { include resolv }
+ "ubcece", "darmstadt"
, "ftcollins", "grnet"
: { include resolv }
}
}
}
}