X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b0bd0f9d68fd99f02247957196234dc61cf7c9b6;hb=0808e7cdefd89761bee793e373d391ea076ff3de;hp=f56d6ed3d2da1da0218c1fed67a953e651d67485;hpb=dd66570732bc7f904931c4565aba0dca9a6915c6;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f56d6ed3d..b0bd0f9d6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,167 +1,110 @@
 Package {
-    require => File["/etc/apt/apt.conf.d/local-recommends"]
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-    owner   => root,
-    group   => root,
-    mode    => 444,
-    ensure  => file,
+	owner  => root,
+	group  => root,
+	mode   => '0444',
+	ensure => file,
 }
 
 Exec {
-    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+	path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
-node default {
-    $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
-
-    include munin-node
-    include syslog-ng
-    include sudo
-    include ssh
-    include debian-org
-    include monit
-    include apt-keys
-    include ntp
-    include ssl
-
-    include motd
-
-    case $hostname {
-        finzi,fano,fasch,field:    { include kfreebsd }
-    }
-
-    case $smartarraycontroller {
-        "true":    { include debian-proliant }
-    }
-    case $kvmdomain {
-        "true": {
-            package { acpid: ensure => installed }
-            case getfromhash($nodeinfo, 'squeeze') {
-                true:  { package { acpi-support-base: ensure => installed } }
-            }
-        }
-    }
-    case $mptraid {
-        "true":    { include "raidmpt" }
-    }
-
-    case $mta {
-        "exim4":   {
-             case getfromhash($nodeinfo, 'heavy_exim') {
-                  true:  { include exim::mx }
-                  default: { include exim }
-             }
-        }
-    }
-
-    case getfromhash($nodeinfo, 'puppetmaster') {
-        true: { include puppetmaster }
-    }
-
-    case getfromhash($nodeinfo, 'muninmaster') {
-        true: { include munin-node::master }
-    }
-
-    case getfromhash($nodeinfo, 'nagiosmaster') {
-        true:    { include nagios::server }
-        default: { include nagios::client }
-    }
-
-    case $apache2 {
-         "true":  {
-              case getfromhash($nodeinfo, 'apache2_security_mirror') {
-                     true:    { include apache2::security_mirror }
-              }
-              case getfromhash($nodeinfo, 'apache2_www_mirror') {
-                     true:    { include apache2::www_mirror }
-              }
-              case getfromhash($nodeinfo, 'apache2_backports_mirror') {
-                     true:    { include apache2::backports_mirror }
-              }
-              include apache2
-         }
-    }
-
-    case $rsyncd {
-         "true": { include rsyncd-log }
-    }
-
-
-    case getfromhash($nodeinfo, 'buildd') {
-         true:  {
-             include buildd
-         }
-    }
-
-    case $hostname {
-        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: {
-            include ferm
-            include ferm::per-host
-            case $rsyncd {
-                "true": { include ferm::rsync }
-            }
-        }
-    }
-
-    case $hostname {
-        beethoven,duarte,ravel,spohr,stabile: {
-            include nfs-server
-        }
-    }
-
-    case $brokenhosts {
-        "true":    { include hosts }
-    }
-    case $portforwarder_user_exists {
-        "true":    { include portforwarder }
-    }
-
-    include samhain
-
-    case $hostname {
-        byrd,schuetz,tchaikovsky: {
-            include krb
-        }
-        draghi,quantz: {
-            include krb
-            include afs
-        }
-        lamb,locke,rautavaara,rietz: {
-            include krb
-            include afs::server
-        }
-    }
-
-    case $hostname {
-        chopin,geo3,soler,wieck: {
-            include debian-radvd
-        }
-    }
-
-    case $kernel {
-        Linux: { include entropykey }
-    }
-
+Service {
+	hasrestart => true,
+	hasstatus  => true,
 }
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+node default {
+	include site
+	include munin
+	include syslog_ng
+	include sudo
+	include ssh
+	include debian_org
+	include monit
+	include time
+	include ssl
+	include hardware
+	include nagios::client
+	include resolv
+	include roles
+	include motd
+	include unbound
+	include bacula::client
+	include autofs
+	include dsa_lvm
+	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 {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
+	}
+
+	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 $::kernel == 'Linux' {
+		include linux
+		include acpi
+	}
+
+	if $::mta == 'exim4' {
+		if getfromhash($site::nodeinfo, 'heavy_exim') {
+			include exim::mx
+		} else {
+			include exim
+		}
+	} elsif $::mta == 'postfix' {
+		include postfix
+	} else {
+		include exim
+	}
+
+	if $::apache2 {
+		include apache2
+	}
+
+	if $::hostname in [geo1,geo2,geo3] {
+		include named::geodns
+	}
+
+	if $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,lw09,lw10,senfter,gretchaninov,sibelius] {
+		include nfs_server
+	}
+
+	if $::brokenhosts {
+		include hosts
+	}
+
+	if $::samhain {
+		include samhain
+	}
+
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
+	}
+
+	if $::spamd {
+		munin::check { 'spamassassin': }
+	}
+
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
+	}
+}