X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=e56ca7d112f44be264fb56a366d9d7a78c82bed9;hb=b9671e1043fdfc5f3aea127f51562dae2e9c9cf6;hp=54ed6528471689ca7c14819daf0f5fc6a6bb5a56;hpb=e3841f9f1bc67a248f63e393848a959526a531af;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 54ed6528..e56ca7d1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,17 +33,37 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
+	include unbound
+	include bacula::client
 
-	if $::hostname in [pasquini,tristano] {
+	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
 		include ganeti2
 	}
 
-	if $::hostname in [finzi,fano,fasch,field] {
-		include kfreebsd
+	if $::hostname == 'dinis' {
+		include bacula::director
+	} else {
+		package { 'bacula-console':
+			ensure => purged;
+		}
+
+		file { '/etc/bacula/bconsole.conf':
+			ensure => absent;
+		}
 	}
 
-	if $::kvmdomain {
-		include acpi
+	if $::hostname == 'beethoven' {
+		include bacula::storage
+	}
+
+	if $::kernel == Linux {
+		include linux
+		if $::kvmdomain {
+			include acpi
+		}
+	} elsif $::kernel == 'GNU/kFreeBSD' {
+		include kfreebsd
 	}
 
 	if $::mta == 'exim4' {
@@ -52,77 +72,27 @@ node default {
 		} else {
 			include exim
 		}
-	} elsif $::hostname == 'bendel' {
+	} elsif $::mta == 'postfix' {
 		include postfix
-	}
-
-	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
+	} 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] {
 		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] {
+	if $::hostname in [beethoven,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -144,11 +114,11 @@ node default {
 		include postgres
 	}
 
-	if $::spamd {
-		munin::check { 'spamassassin': }
+	if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, schumann, soler, widor, wolkenstein] {
+		@@bacula::node { $::fqdn: }
 	}
 
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
-		include vsftpd
+	if $::spamd {
+		munin::check { 'spamassassin': }
 	}
 }