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 git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
2a27462
..
363d0fc
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-44,7
+44,7
@@
node default {
"true": {
package { acpid: ensure => installed }
case extractnodeinfo($nodeinfo, 'squeeze') {
"true": {
package { acpid: ensure => installed }
case extractnodeinfo($nodeinfo, 'squeeze') {
-
'true'
: { package { acpi-support-base: ensure => installed } }
+
true
: { package { acpi-support-base: ensure => installed } }
}
}
}
}
}
}
@@
-55,12
+55,16
@@
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 }
}
}
}
+ case extractnodeinfo($nodeinfo, 'puppetmaster') {
+ true: { include puppetmaster }
+ }
+
case extractnodeinfo($nodeinfo, 'muninmaster') {
true: { include munin-node::master }
}
case extractnodeinfo($nodeinfo, 'muninmaster') {
true: { include munin-node::master }
}
@@
-74,8
+78,11
@@
node default {
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
true: { include apache2::security_mirror }
"true": {
case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
true: { include apache2::security_mirror }
- default: { include apache2 }
}
}
+ case extractnodeinfo($nodeinfo, 'apache2_www_mirror') {
+ true: { include apache2::www_mirror }
+ }
+ include apache2
}
}
}
}
@@
-85,7
+92,7
@@
node default {
case extractnodeinfo($nodeinfo, 'buildd') {
case extractnodeinfo($nodeinfo, 'buildd') {
-
'true'
: {
+
true
: {
include buildd
}
}
include buildd
}
}
@@
-100,6
+107,9
@@
node default {
Linux: {
include ferm
include ferm::per-host
Linux: {
include ferm
include ferm::per-host
+ case $rsyncd {
+ "true": { include ferm::rsync }
+ }
}
}
}
}
@@
-122,7
+132,7
@@
node default {
include samhain
case $hostname {
include samhain
case $hostname {
- byrd,schuetz: {
+ byrd,schuetz
,tchaikovsky
: {
include krb
}
draghi,quantz,samosa: {
include krb
}
draghi,quantz,samosa: {