projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a reboot cronjob to remove no-daemon-please
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
05964ac
..
b8f396b
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-9,10
+9,23
@@
File {
ensure => file,
}
ensure => file,
}
+Exec {
+ path => "/usr/bin:/usr/sbin:/bin:/sbin"
+}
+
node default {
node default {
+ $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
+
include munin-node
include munin-node
- include samhain
+ include sudo
+ include ssh
include debian-org
include debian-org
+ include monit
+ include apt-keys
+ include ntp
+
+ include motd
+ include samhain
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-20,36
+33,57
@@
node default {
}
case $mta {
}
case $mta {
- "exim4": { include exim }
+ "exim4": {
+ case extractnodeinfo($nodeinfo, 'heavy_exim') {
+ "true": { include exim::mx }
+ default: { include exim }
+ }
+ }
default: {}
}
default: {}
}
- import "nagios"
- include nagios-client
case $hostname {
case $hostname {
- spohr: {
- import "nagios"
- include nagios-server
- }
- default: {}
+ spohr: {
+ include nagios::server
+ }
+ default: {
+ include nagios::client
+ }
}
}
- case $apache2 {
- "true": { case $hostname {
- "carver": { include apache2 }
- default: {}
- } }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+ "true": { include apache2 }
+ default: { }
+ }
- # test here first
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ "true": { include buildd }
+ default: { }
+ }
+ case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
+ "true": { include apache2::security_mirror }
+ default: { }
+ }
+
+
+# maybe wait for rietz to be upgraded to lenny
case $hostname {
case $hostname {
- handel,geo1,geo2,geo3,wieck,brahms,bartok,spohr,sperger,carver,rore,malo,peri,penalosa,praetorius: { include sudo }
+ rietz,raff,klecker:
+ { include named::secondary }
default: {}
}
default: {}
}
-}
-node penalosa inherits default {
- include hosts
+ case $hostname {
+ geo1,geo2,geo3:
+ {
+ include named::geodns
+ }
+ default: {
+ }
+ }
+ case $brokenhosts {
+ "true": { include hosts }
+ default: {}
+ }
}
}