X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=deeccd91c8fce036c9a48b8dcfcae94753b5e6be;hb=a3a14782d9e8cd44ce1b63cfbe517924c9b5651b;hp=f3e19addc9ce4c5e7386cf656e97fb38a1dc3cb5;hpb=21af4a2478fd12776879c6652af1edd0a471a856;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index f3e19addc..deeccd91c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,70 +1,158 @@
 Package {
-    require => File["/etc/apt/apt.conf.d/local-recommends"]
+	noop    => true,
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-    owner   => root,
-    group   => root,
-    mode    => 444,
-    ensure  => file,
+	noop   => true,
+	owner  => root,
+	group  => root,
+	mode   => '0444',
+	ensure => file,
 }
 
 Exec {
-    path => "/usr/bin:/usr/sbin:/bin:/sbin"
+	noop => true,
+	path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
-node default {
-    include munin-node
-    include sudo
-    include debian-org
-    include monit
-    include samhain
-    include apt-keys
-
-    $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
-
-    include motd
-
-    case $smartarraycontroller {
-        "true":    { include debian-proliant }
-        default: {}
-    }
-
-    case $mta {
-        "exim4":   { include exim }
-        default:   {}
-    }
-
-
-    case $hostname {
-        spohr: {
-                      include nagios::server
-        }
-        default: {
-		      include nagios::client
-	}
-    }
-
-    case $apache2 {
-        "true":    { case $hostname {
-                        carver,rore,tartini:  { include apache2 }
-                        default:   {}
-                   } }
-        default: {}
-    }
-
-    case $hostname {
-        ancina,brahms,goedel,goetz,lafayette,malo,praetorius,puccini:
-                   { include buildd }
-        default:   {}
-    }
-    case $hostname {
-        geo1,geo2,geo3:
-                   { include geodns }
-        default:   {}
-    }
+Service {
+	noop       => true,
+	hasrestart => true,
+	hasstatus  => true,
 }
 
-node penalosa inherits default {
-    include hosts
+node default {
+	include site
+	include munin
+	include syslog-ng
+	include sudo
+	include ssh
+	include debian-org
+	include monit
+	include ntp
+	include ntpdate
+	include ssl
+	include motd
+	include hardware
+	include nagios::client
+	include resolv
+
+	if $::hostname in [finzi,fano,fasch,field] {
+		include kfreebsd
+	}
+
+	if $::kvmdomain {
+		include acpi
+	}
+
+	if $::mta == 'exim4' {
+		if getfromhash($site::nodeinfo, 'heavy_exim') {
+			include exim::mx
+		} else {
+			include exim
+		}
+	}
+
+	if $::lsbdistcodename != 'lenny' {
+		include unbound
+	}
+
+	if getfromhash($site::nodeinfo, 'puppetmaster') {
+		include puppetmaster
+	}
+
+	if getfromhash($site::nodeinfo, 'muninmaster') {
+		include munin::master
+	}
+
+	if getfromhash($site::nodeinfo, 'nagiosmaster') {
+		include nagios::server
+	}
+
+	if getfromhash($site::nodeinfo, 'buildd') {
+		include buildd
+	}
+
+	if $::hostname in [chopin,franck,morricone,bizet] {
+		include roles::dakmaster
+	}
+
+	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+		include roles::security_mirror
+	}
+
+	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
+		include roles::www_mirror
+	}
+
+	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
+		include roles::backports_mirror
+	}
+
+	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
+		include roles::ftp-upcoming_mirror
+	}
+
+	if $::apache2 {
+		include apache2
+	}
+
+	if $::rsyncd {
+		include rsyncd-log
+	}
+
+	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+		include named::authoritative
+	} elsif $::hostname in [geo1,geo2,geo3] {
+		include named::geodns
+	} elsif $::hostname == 'liszt' {
+		include named::recursor
+	}
+
+	if $::kernel == 'Linux' {
+		include ferm
+		include ferm::per-host
+		include entropykey
+	}
+
+	if $::hostname in [diabelli,nono,spohr] {
+		include dacs
+	}
+
+	if $::hostname in [beethoven,duarte,spohr,stabile] {
+		include nfs-server
+	}
+
+	if $::brokenhosts {
+		include hosts
+	}
+
+	if $::portforwarder_user_exists {
+		include portforwarder
+	}
+
+	include samhain
+
+	if $::hostname in [chopin,geo3,soler,wieck] {
+		include debian-org::radvd
+	}
+
+	if ($::postgres84 or $::postgres90) {
+		include postgres
+	}
+
+	if $::spamd {
+		munin::check { 'spamassassin': }
+	}
+
+	if $::vsftpd {
+		package { 'logtail':
+			ensure => installed
+		}
+		munin::check { 'vsftpd': }
+		munin::check { 'ps_vsftpd':
+			script => 'ps_'
+		}
+	}
 }