projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Taken from NEWS.Debian:
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
c3b08e1
..
dd047ef
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-18,17
+18,18
@@
node default {
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
$hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
$keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
$hoster = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
$keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber")
+ $mxinfo = allnodeinfo("mXRecord")
notice("hoster for ${fqdn} is ${hoster}")
notice("hoster for ${fqdn} is ${hoster}")
- $mxinfo = allnodeinfo("mXRecord")
-
include munin-node
include munin-node
+ include syslog-ng
include sudo
include ssh
include debian-org
include monit
include apt-keys
include ntp
include sudo
include ssh
include debian-org
include monit
include apt-keys
include ntp
+ include ssl
include motd
include motd
@@
-40,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" }
@@
-49,7
+55,7
@@
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 }
}
}
@@
-73,31
+79,36
@@
node default {
}
}
}
}
- case
extractnodeinfo($nodeinfo, 'buildd')
{
-
true: { include buildd
}
+ case
$rsyncd
{
+
"true": { include rsyncd-log
}
}
}
- case $hostname {
- klecker,ravel,senfl,orff: { include named::secondary }
- geo1,geo2,geo3: { include named::geodns }
- bartok: { include named::recursor }
+
+ case extractnodeinfo($nodeinfo, 'buildd') {
+ 'true': {
+ include buildd
+ }
}
}
-
+
case $hostname {
case $hostname {
- senfl: { include rsync }
+ klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+ geo1,geo2,geo3: { include named::geodns }
+ franck,liszt,master,samosa,schein,spohr,steffani,widor: { include named::recursor }
}
}
- case $hostname {
- logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { include ferm }
+ case $kernel {
+ Linux: {
+ include ferm
+ include ferm::per-host
+ }
}
}
+
case $hostname {
case $hostname {
- piatti: {
- @ferm::rule { "dsa-udd-stunnel":
- description => "port 8080 for udd stunnel",
- rule => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 )"
- }
+ beethoven,ravel,spohr,stabile: {
+ include nfs-server
}
}
}
}
+
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
@@
-107,5
+118,24
@@
node default {
case $portforwarder_user_exists {
"true": { include portforwarder }
}
case $portforwarder_user_exists {
"true": { include portforwarder }
}
+
include samhain
include samhain
+
+ case $hostname {
+ byrd,schuetz,tchaikovsky: {
+ include krb
+ }
+ draghi,quantz,samosa: {
+ include krb
+ include afs
+ }
+ lamb,locke,rautavaara,rietz: {
+ include krb
+ include afs::server
+ }
+ }
}
}
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: