projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
b2ee4e5
..
2fecb32
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,schein
:
{ include named::recursor }
+ bartok,schein
,steffani:
{ include named::recursor }
}
case $hostname {
}
case $hostname {
- logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein: { 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: {
@@
-100,7
+107,7
@@
node default {
rule => "&SERVICE(tcp, 873)"
}
}
rule => "&SERVICE(tcp, 873)"
}
}
- saens,villa,lobos,raff,gluck,schein: {
+ 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",