projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare a named-security module that handles the config that is currently in dsa...
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
d8d7490
..
9e657d5
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-19,10
+19,11
@@
node default {
include debian-org
include monit
include samhain
include debian-org
include monit
include samhain
+ include apt-keys
- $nodeinfo = nodeinfo($fqdn, "/
home/sgran
/local.yaml")
- notice($nodeinfo.class)
- notice($nodeinfo)
+ $nodeinfo = nodeinfo($fqdn, "/
etc/puppet/modules/debian-org/misc
/local.yaml")
+
+ include motd
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-38,27
+39,33
@@
node default {
case $hostname {
spohr: {
include nagios::server
case $hostname {
spohr: {
include nagios::server
- include motd::new
}
default: {
include nagios::client
}
default: {
include nagios::client
- include motd
}
}
case $apache2 {
"true": { case $hostname {
}
}
case $apache2 {
"true": { case $hostname {
- carver,rore,
tartini
: { include apache2 }
+ carver,rore,
draghi,tartini,samosa,duarte
: { include apache2 }
default: {}
} }
default: {}
}
case $hostname {
default: {}
} }
default: {}
}
case $hostname {
- ancina,
brahms,goedel,goetz,lafayette,malo,praetorius,puccini
:
+ ancina,
arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer
:
{ include buildd }
default: {}
}
{ include buildd }
default: {}
}
+
+# maybe wait for rietz to be upgraded to lenny
+# case $hostname {
+# rietz,raff,klecker:
+# { include named-secondary }
+# default: {}
+# }
+
case $hostname {
geo1,geo2,geo3:
{ include geodns }
case $hostname {
geo1,geo2,geo3:
{ include geodns }