X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b0bd0f9d68fd99f02247957196234dc61cf7c9b6;hb=2972577c62e8dfa15c111d5072b5755c3d1550e3;hp=c671af50842f97190fbffc705979506ecc428d76;hpb=5b12b51119e520e46e41dcf55485c092876cd702;p=mirror%2Fdsa-puppet.git diff --git a/manifests/site.pp b/manifests/site.pp index c671af508..b0bd0f9d6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -21,10 +21,10 @@ Service { node default { include site include munin - include syslog-ng + include syslog_ng include sudo include ssh - include debian-org + include debian_org include monit include time include ssl @@ -40,6 +40,12 @@ node default { include grub include multipath include popcon + include portforwarder + include postgres + include haveged + include huge_mem + include tcp_bbr + if $::lsbdistcodename == squeeze { include roles::udldap::client } else { @@ -49,31 +55,13 @@ node default { } } - if $::hostname in [ubc-bl7,ubc-bl3,ubc-bl2,ubc-bl6,ubc-bl8,ubc-bl4,byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10] { + if $::hostname in [byrd,clementi,czerny,bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14,csail-node01,csail-node02,grnet-node01,grnet-node02,ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10,conova-node01,conova-node02] { include ganeti2 } - if $::hostname == 'dinis' { - include bacula::director - } else { - package { 'bacula-console': - ensure => purged; - } - - file { '/etc/bacula/bconsole.conf': - ensure => absent; - } - } - - if $::hostname == 'storace' { - include bacula::storage - } - - if $::kernel == Linux { + if $::kernel == 'Linux' { include linux include acpi - } elsif $::kernel == 'GNU/kFreeBSD' { - include kfreebsd } if $::mta == 'exim4' { @@ -96,40 +84,26 @@ node default { include named::geodns } - if $::hostname in [buxtehude,glinka,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov] { - include nfs-server + if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] { + include nfs_server } if $::brokenhosts { include hosts } - if $::portforwarder_user_exists { - include portforwarder - } - if $::samhain { include samhain } if $::hostname in [geo3,wieck] { - include debian-org::radvd - } - - if ($::postgres) { - include postgres + include debian_org::radvd } if $::spamd { munin::check { 'spamassassin': } } - if $::hoster { - if $::hoster in [ynic] { - include lldp - } - } - if $::hostname == 'pkgmirror-csail' { include varnish }