projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
munin must run ip6 plugin as root as well
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
fc671d4
..
7a8565d
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-74,17
+74,24
@@
node default {
}
case extractnodeinfo($nodeinfo, 'buildd') {
}
case extractnodeinfo($nodeinfo, 'buildd') {
- true: { include buildd }
+ 'true': {
+ include buildd
+ case $kernel {
+ Linux: {
+ include ferm
+ }
+ }
+ }
}
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 }
+ bartok
,schein,steffani:
{ include named::recursor }
}
case $hostname {
}
case $hostname {
- logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens: { include ferm }
+ logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens
,villa,lobos,raff,gluck,schein,wieck,steffani,ball
: { include ferm }
}
case $hostname {
piatti: {
}
case $hostname {
piatti: {
@@
-93,14
+100,14
@@
node default {
rule => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
}
}
rule => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
}
}
- senfl {
+ senfl
:
{
@ferm::rule { "dsa-rsync":
domain => "(ip ip6)",
description => "Allow rsync access",
rule => "&SERVICE(tcp, 873)"
}
}
@ferm::rule { "dsa-rsync":
domain => "(ip ip6)",
description => "Allow rsync access",
rule => "&SERVICE(tcp, 873)"
}
}
- saens: {
+ saens
,villa,lobos,raff,gluck,schein,wieck,steffani
: {
@ferm::rule { "dsa-ftp":
domain => "(ip ip6)",
description => "Allow ftp access",
@ferm::rule { "dsa-ftp":
domain => "(ip ip6)",
description => "Allow ftp access",
@@
-112,6
+119,12
@@
node default {
rule => "&SERVICE(tcp, 873)"
}
}
rule => "&SERVICE(tcp, 873)"
}
}
+ ancina,zelenka: {
+ @ferm::rule { "dsa-time":
+ description => "Allow time access",
+ rule => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+ }
+ }
}
case $brokenhosts {
}
case $brokenhosts {