projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move dns info for osuosl and grnet to hosters.yaml
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
22e773d
..
97df07e
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-16,12
+16,13
@@
Exec {
node default {
$localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
$nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
node default {
$localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
$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")
+ $hoster
info
= whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+ $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber"
, "purpose"
)
$mxinfo = allnodeinfo("mXRecord")
$mxinfo = allnodeinfo("mXRecord")
- notice("hoster for ${fqdn} is ${hoster}")
+ notice("hoster for ${fqdn} is ${hoster
info
}")
include munin-node
include munin-node
+ include syslog-ng
include sudo
include ssh
include debian-org
include sudo
include ssh
include debian-org
@@
-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 getfromhash($nodeinfo, 'squeeze') {
+ true: { package { acpi-support-base: ensure => installed } }
+ }
+ }
}
case $mptraid {
"true": { include "raidmpt" }
}
case $mptraid {
"true": { include "raidmpt" }
@@
-48,33
+54,45
@@
node default {
case $mta {
"exim4": {
case $mta {
"exim4": {
- case
extractnodeinfo
($nodeinfo, 'heavy_exim') {
-
'true'
: { include exim::mx }
+ case
getfromhash
($nodeinfo, 'heavy_exim') {
+
true
: { include exim::mx }
default: { include exim }
}
}
}
default: { include exim }
}
}
}
- case extractnodeinfo($nodeinfo, 'muninmaster') {
+ case getfromhash($nodeinfo, 'puppetmaster') {
+ true: { include puppetmaster }
+ }
+
+ case getfromhash($nodeinfo, 'muninmaster') {
true: { include munin-node::master }
}
true: { include munin-node::master }
}
- case
extractnodeinfo
($nodeinfo, 'nagiosmaster') {
+ case
getfromhash
($nodeinfo, 'nagiosmaster') {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
true: { include nagios::server }
default: { include nagios::client }
}
case $apache2 {
"true": {
- case
extractnodeinfo
($nodeinfo, 'apache2_security_mirror') {
+ case
getfromhash
($nodeinfo, 'apache2_security_mirror') {
true: { include apache2::security_mirror }
true: { include apache2::security_mirror }
- default: { include apache2 }
}
}
+ case getfromhash($nodeinfo, 'apache2_www_mirror') {
+ true: { include apache2::www_mirror }
+ }
+ include apache2
}
}
}
}
- case extractnodeinfo($nodeinfo, 'buildd') {
- 'true': {
+ case $rsyncd {
+ "true": { include rsyncd-log }
+ }
+
+
+ case getfromhash($nodeinfo, 'buildd') {
+ true: {
include buildd
}
}
include buildd
}
}
@@
-82,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
}
}
@@
-101,7
+122,7
@@
node default {
case $brokenhosts {
"true": { include hosts }
}
case $brokenhosts {
"true": { include hosts }
}
- case
$hoster
{
+ case
getfromhash($hosterinfo, 'name')
{
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
case $portforwarder_user_exists {
"ubcece", "darmstadt", "ftcollins", "grnet": { include resolv }
}
case $portforwarder_user_exists {
@@
-111,11
+132,24
@@
node default {
include samhain
case $hostname {
include samhain
case $hostname {
- byrd,schuetz,draghi,lamb,locke,rautavaara: { include krb }
+ byrd,schuetz,tchaikovsky: {
+ include krb
+ }
+ draghi,quantz: {
+ include krb
+ include afs
+ }
+ lamb,locke,rautavaara,rietz: {
+ include krb
+ include afs::server
+ }
}
}
+
case $hostname {
case $hostname {
- lamb,locke,rautavaara: { include afs::server }
- }
+ chopin,geo3,soler,wieck: {
+ include debian-radvd
+ }
+ }
}
# vim:set et:
}
# vim:set et: