X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=fa4da4f35a0d148d6471b1e0fa1da0ef7e25200d;hb=5cec923721311b25fbd4dddb68d5340a2261b1f9;hp=a55107b4cffe8259c4cc45d8090fa4db395ac708;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b4c..fa4da4f35 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,10 +3,10 @@ Package {
 }
 
 File {
-	owner   => root,
-	group   => root,
-	mode    => '0444',
-	ensure  => file,
+	owner  => root,
+	group  => root,
+	mode   => '0444',
+	ensure => file,
 }
 
 Exec {
@@ -21,26 +21,47 @@ 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 apt-keys
-	include ntp
-	include ntpdate
+	include time
 	include ssl
-	include motd
 	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
+
+	if $::lsbdistcodename == squeeze {
+		include roles::udldap::client
+	} else {
+		include roles::pubsub::client
+		class { 'roles::udldap::client':
+			ensure => absent
+		}
+	}
 
-	if $::hostname in [finzi,fano,fasch,field] {
-		include kfreebsd
+	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,aagaard,acker] {
+		include ganeti2
 	}
 
-	if $::kvmdomain {
+	if $::kernel == 'Linux' {
+		include linux
 		include acpi
+	} elsif $::kernel == 'GNU/kFreeBSD' {
+		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -49,107 +70,41 @@ node default {
 		} 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
+	} elsif $::mta == 'postfix' {
+		include postfix
+	} else {
+		include exim
 	}
 
 	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] {
+	if $::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 $::hostname in [buxtehude,milanollo,lw01,lw02,lw03,lw04,senfter,gretchaninov,sibelius] {
+		include nfs_server
 	}
 
 	if $::brokenhosts {
 		include hosts
 	}
 
-	if $::portforwarder_user_exists {
-		include portforwarder
+	if $::samhain {
+		include samhain
 	}
 
-	include samhain
-
-	if $::hostname in [chopin,geo3,soler,wieck] {
-		include debian-org::radvd
-	}
-
-	if ($::postgres84 or $::postgres90) {
-		include postgres
+	if $::hostname in [geo3,wieck] {
+		include debian_org::radvd
 	}
 
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::vsftpd {
-		package { 'logtail':
-			ensure => installed
-		}
-		munin::check { 'vsftpd': }
-		munin::check { 'ps_vsftpd':
-			script => 'ps_'
-		}
+	if $::hostname == 'pkgmirror-csail' {
+		include varnish
 	}
 }