projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "byebye ries""
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
d19223b
..
d4f7b84
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-29,6
+29,7
@@
node default {
include monit
include apt-keys
include ntp
include monit
include apt-keys
include ntp
+ include ssl
include motd
include motd
@@
-49,7
+50,7
@@
node default {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
case $mta {
"exim4": {
case extractnodeinfo($nodeinfo, 'heavy_exim') {
-
true:
{ include exim::mx }
+
'true':
{ include exim::mx }
default: { include exim }
}
}
default: { include exim }
}
}
@@
-74,30
+75,30
@@
node default {
}
case extractnodeinfo($nodeinfo, 'buildd') {
}
case extractnodeinfo($nodeinfo, 'buildd') {
- true: { include buildd }
+ 'true': {
+ include buildd
+ }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
geo1,geo2,geo3: { include named::geodns }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
geo1,geo2,geo3: { include named::geodns }
- bartok: { include named::recursor }
- }
-
- case $hostname {
- senfl: { include rsync }
+ bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani: { include named::recursor }
}
}
- case $hostname {
- logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { include ferm }
+ case $kernel {
+ Linux: {
+ include ferm
+ include ferm::per-host
+ }
}
}
+
case $hostname {
case $hostname {
- piatti: {
- @ferm::rule { "dsa-udd-stunnel":
- description => "port 8080 for udd stunnel",
- rule => "proto tcp saddr ( 192.25.206.16 70.103.162.29 217.196.43.134 ) dport 8080 ACCEPT;"
- }
+ beethoven,ravel,spohr: {
+ include nfs-server
}
}
}
}
+
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
@@
-109,3
+110,7
@@
node default {
}
include samhain
}
}
include samhain
}
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: