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 ssh module
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
f834f80
..
70b6722
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,6
+16,7
@@
Exec {
node default {
include munin-node
include sudo
node default {
include munin-node
include sudo
+ include ssh
include debian-org
include monit
include apt-keys
include debian-org
include monit
include apt-keys
@@
-32,8
+33,8
@@
node default {
case $mta {
"exim4": {
case $mta {
"exim4": {
- case
$hostname
{
-
powell
: { include exim::mx }
+ case
extractnodeinfo($nodeinfo, 'heavy_exim')
{
+
"true"
: { include exim::mx }
default: { include exim }
}
}
default: { include exim }
}
}
@@
-50,19
+51,15
@@
node default {
}
}
}
}
- case $apache2 {
- "true": { case $hostname {
- carver,rore,draghi,tartini,samosa,duarte,piatti: { include apache2 }
- default: {}
- } }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'apache2_defaultconfig') {
+ "true": { include apache2 }
+ default: { }
+ }
- case $hostname {
- ancina,arcadelt,argento,brahms,goedel,goetz,lafayette,malo,murphy,praetorius,puccini,paer:
- { include buildd }
- default: {}
- }
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ "true": { include buildd }
+ default: { }
+ }
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
# maybe wait for rietz to be upgraded to lenny
# case $hostname {
@@
-71,13
+68,13
@@
node default {
# default: {}
# }
# default: {}
# }
- case $hostname {
- geo1,geo2,geo3:
- { include geodns }
- default: {}
- }
-}
-
-node penalosa inherits default {
- include hosts
+
case $hostname {
+
geo1,geo2,geo3:
+
{ include geodns }
+
default: {}
+
}
+ case $brokenhosts {
+ "true": { include hosts }
+ default: {}
+ }
}
}