X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=manifests%2Fsite.pp;h=a382663e76ced2230d4a80d25f572506f0fad569;hp=deeccd91c8fce036c9a48b8dcfcae94753b5e6be;hb=1ef5305a212a75308012f5a29a64223ea04ca5cd;hpb=58b867b10275e400ca5df35d78bf8bb21bc6713d

diff --git a/manifests/site.pp b/manifests/site.pp
index deeccd91..a382663e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,10 +1,8 @@
 Package {
-	noop    => true,
 	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
-	noop   => true,
 	owner  => root,
 	group  => root,
 	mode   => '0444',
@@ -12,12 +10,10 @@ File {
 }
 
 Exec {
-	noop => true,
 	path => '/usr/bin:/usr/sbin:/bin:/sbin'
 }
 
 Service {
-	noop       => true,
 	hasrestart => true,
 	hasstatus  => true,
 }
@@ -37,90 +33,61 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
+	include unbound
 
-	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 $::hostname in [pasquini,tristano,bertali,boito] {
+		include ganeti2
 	}
 
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
+	if $::hostname == 'dinis' {
+		include bacula::director
 	}
 
-	if $::hostname in [chopin,franck,morricone,bizet] {
-		include roles::dakmaster
+	if $::hostname in [berlioz, biber] {
+		include bacula::client
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
+	if $::hostname == 'beethoven' {
+		include bacula::storage
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
-	}
-
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
+	if $::kernel == Linux {
+		include linux
+		if $::kvmdomain {
+			include acpi
+		}
+	} elsif $::kernel == 'GNU/kFreeBSD' {
+		include kfreebsd
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	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 $::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,duarte,spohr,stabile,beach] {
 		include nfs-server
 	}
 
@@ -145,14 +112,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::vsftpd {
-		package { 'logtail':
-			ensure => installed
-		}
-		munin::check { 'vsftpd': }
-		munin::check { 'ps_vsftpd':
-			script => 'ps_'
-		}
-	}
 }