X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3c862097c8b2fe8540b4b62a9ec82e884f17d4b9;hb=c5f60da7828a73e49b98951b7bf1a67d1e17d502;hp=97df07e7c3695914d83ff1a9c7108ba088c19e69;hpb=016558ddd713144f5a5fa0978159b47976945b05;p=mirror%2Fdsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index 97df07e7c..3c862097c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -16,10 +16,8 @@ Exec { node default { $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml") $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") - $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml") - $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose") - $mxinfo = allnodeinfo("mXRecord") - notice("hoster for ${fqdn} is ${hosterinfo}") + $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord physicalHost purpose") + notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) ) include munin-node include syslog-ng @@ -42,15 +40,24 @@ node default { } case $kvmdomain { "true": { - package { acpid: ensure => installed } - case getfromhash($nodeinfo, 'squeeze') { - true: { package { acpi-support-base: ensure => installed } } + case $debarchitecture { + kfreebsd-amd64,kfreebsd-i386: { + } + default: { + package { acpid: ensure => installed } + case getfromhash($nodeinfo, 'squeeze') { + true: { package { acpi-support-base: ensure => installed } } + } + } } } } case $mptraid { "true": { include "raidmpt" } } + case $productname { + "PowerEdge 2850": { include megactl } + } case $mta { "exim4": { @@ -82,6 +89,12 @@ node default { case getfromhash($nodeinfo, 'apache2_www_mirror') { true: { include apache2::www_mirror } } + case getfromhash($nodeinfo, 'apache2_backports_mirror') { + true: { include apache2::backports_mirror } + } + case getfromhash($nodeinfo, 'apache2_ftp-upcoming_mirror') { + true: { include apache2::ftp-upcoming_mirror } + } include apache2 } } @@ -98,10 +111,17 @@ node default { } case $hostname { - 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 } + klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative } + geo1,geo2,geo3: { include named::geodns } + liszt: { include named::recursor } + } + case $hostname { + franck,master,lobos,samosa,spohr,widor: { include unbound } + } + case getfromhash($nodeinfo, 'squeeze') { + true: { include unbound } } + include resolv case $kernel { Linux: { @@ -114,7 +134,7 @@ node default { } case $hostname { - beethoven,ravel,spohr,stabile: { + beethoven,duarte,ravel,spohr,stabile: { include nfs-server } } @@ -122,9 +142,6 @@ node default { case $brokenhosts { "true": { include hosts } } - case getfromhash($hosterinfo, 'name') { - "ubcece", "darmstadt", "ftcollins", "grnet": { include resolv } - } case $portforwarder_user_exists { "true": { include portforwarder } } @@ -132,16 +149,8 @@ node default { include samhain case $hostname { - byrd,schuetz,tchaikovsky: { - include krb - } - draghi,quantz: { - include krb - include afs - } - lamb,locke,rautavaara,rietz: { + byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: { include krb - include afs::server } } @@ -149,7 +158,12 @@ node default { chopin,geo3,soler,wieck: { include debian-radvd } - } + } + + case $kernel { + Linux: { include entropykey } + } + } # vim:set et: