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
c843705
..
363d0fc
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-41,7
+41,12
@@
node default {
"true": { include debian-proliant }
}
case $kvmdomain {
"true": { include debian-proliant }
}
case $kvmdomain {
- "true": { package { acpid: ensure => installed } }
+ "true": {
+ package { acpid: ensure => installed }
+ case extractnodeinfo($nodeinfo, 'squeeze') {
+ true: { package { acpi-support-base: ensure => installed } }
+ }
+ }
}
case $mptraid {
"true": { include "raidmpt" }
}
case $mptraid {
"true": { include "raidmpt" }
@@
-50,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 }
}
@@
-69,13
+78,21
@@
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
}
}
}
}
+ case $rsyncd {
+ "true": { include rsyncd-log }
+ }
+
+
case extractnodeinfo($nodeinfo, 'buildd') {
case extractnodeinfo($nodeinfo, 'buildd') {
-
'true'
: {
+
true
: {
include buildd
}
}
include buildd
}
}
@@
-83,18
+100,21
@@
node default {
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
case $hostname {
klecker,ravel,senfl,orff,draghi: { include named::authoritative }
geo1,geo2,geo3: { include named::geodns }
-
bartok,franck,liszt,master,samosa,schein,spohr,steffani
: { include named::recursor }
+
franck,liszt,master,samosa,schein,spohr,steffani,widor
: { include named::recursor }
}
case $kernel {
Linux: {
include ferm
include ferm::per-host
}
case $kernel {
Linux: {
include ferm
include ferm::per-host
+ case $rsyncd {
+ "true": { include ferm::rsync }
+ }
}
}
case $hostname {
}
}
case $hostname {
- beethoven,ravel,spohr: {
+ beethoven,ravel,spohr
,stabile
: {
include nfs-server
}
}
include nfs-server
}
}
@@
-112,14
+132,14
@@
node default {
include samhain
case $hostname {
include samhain
case $hostname {
- byrd,schuetz: {
+ byrd,schuetz
,tchaikovsky
: {
include krb
}
include krb
}
-
bartok,draghi
: {
+
draghi,quantz,samosa
: {
include krb
include afs
}
include krb
include afs
}
- lamb,locke,rautavaara: {
+ lamb,locke,rautavaara
,rietz
: {
include krb
include afs::server
}
include krb
include afs::server
}