projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ip allocations
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
91e6f59
..
28db182
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,18
+18,25
@@
node default {
include sudo
include debian-org
include monit
include sudo
include debian-org
include monit
+ include apt-keys
+
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
include motd
include samhain
include motd
include samhain
- $nodeinfo = nodeinfo($fqdn, "/home/sgran/local.yaml")
-
case $smartarraycontroller {
"true": { include debian-proliant }
default: {}
}
case $mta {
case $smartarraycontroller {
"true": { include debian-proliant }
default: {}
}
case $mta {
- "exim4": { include exim }
+ "exim4": {
+ case extractnodeinfo($nodeinfo, 'heavy_exim') {
+ "true": { include exim::mx }
+ default: { include exim }
+ }
+ }
default: {}
}
default: {}
}
@@
-45,17
+52,25
@@
node default {
case $apache2 {
"true": { case $hostname {
case $apache2 {
"true": { case $hostname {
- carver,rore,
tartin
i: { include apache2 }
+ carver,rore,
draghi,tartini,samosa,duarte,piatt
i: { 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 }