projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restore stunnel rule
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
66d1622
..
d19223b
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-31,7
+31,10
@@
node default {
include ntp
include motd
include ntp
include motd
- include samhain
+
+ case $hostname {
+ finzi,fano,fasch,field: { include kfreebsd }
+ }
case $smartarraycontroller {
"true": { include debian-proliant }
case $smartarraycontroller {
"true": { include debian-proliant }
@@
-39,53
+42,61
@@
node default {
case $kvmdomain {
"true": { package { acpid: ensure => installed } }
}
case $kvmdomain {
"true": { package { acpid: ensure => installed } }
}
+ case $mptraid {
+ "true": { include "raidmpt" }
+ }
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 }
}
}
}
case extractnodeinfo($nodeinfo, 'muninmaster') {
default: { include exim }
}
}
}
case extractnodeinfo($nodeinfo, 'muninmaster') {
- "true": {
- include munin-node::master
- }
+ true: { include munin-node::master }
}
case extractnodeinfo($nodeinfo, 'nagiosmaster') {
}
case extractnodeinfo($nodeinfo, 'nagiosmaster') {
- "true": {
- include nagios::server
- }
- default: {
- include nagios::client
- }
+ true: { include nagios::server }
+ default: { include nagios::client }
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
}
case $apache2 {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-
"true":
{ include apache2::security_mirror }
+
true:
{ include apache2::security_mirror }
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
default: { include apache2 }
}
}
}
case extractnodeinfo($nodeinfo, 'buildd') {
-
"true"
: { include buildd }
+
true
: { include buildd }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
}
case $hostname {
klecker,ravel,senfl,orff: { include named::secondary }
+ geo1,geo2,geo3: { include named::geodns }
+ bartok: { include named::recursor }
+ }
+
+ case $hostname {
+ senfl: { include rsync }
}
case $hostname {
}
case $hostname {
- logtest01: { include ferm }
+ logtest01
,geo1,geo2,geo3,bartok,senfl,beethoven,piatti
: { include ferm }
}
case $hostname {
}
case $hostname {
- geo1,geo2,geo3: { include named::geodns }
+ 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;"
+ }
+ }
}
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
@@
-93,4
+104,8
@@
node default {
case $hoster {
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
case $hoster {
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
+ case $portforwarder_user_exists {
+ "true": { include portforwarder }
+ }
+ include samhain
}
}