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

diff --git a/manifests/site.pp b/manifests/site.pp
index a55107b4c..3aa599098 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 {
@@ -26,7 +26,6 @@ node default {
 	include ssh
 	include debian-org
 	include monit
-	include apt-keys
 	include ntp
 	include ntpdate
 	include ssl
@@ -34,8 +33,15 @@ node default {
 	include hardware
 	include nagios::client
 	include resolv
+	include roles
 
-	if $::hostname in [finzi,fano,fasch,field] {
+	if $::hostname in [pasquini,tristano] {
+		include ganeti2
+	}
+
+	if $::kernel == Linux {
+		include linux
+	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
@@ -49,48 +55,14 @@ node default {
 		} else {
 			include exim
 		}
+	} else {
+		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
-	}
-
 	if $::apache2 {
 		include apache2
 	}
@@ -107,12 +79,6 @@ node default {
 		include named::recursor
 	}
 
-	if $::kernel == 'Linux' {
-		include ferm
-		include ferm::per-host
-		include entropykey
-	}
-
 	if $::hostname in [diabelli,nono,spohr] {
 		include dacs
 	}
@@ -143,13 +109,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-	if $::vsftpd {
-		package { 'logtail':
-			ensure => installed
-		}
-		munin::check { 'vsftpd': }
-		munin::check { 'ps_vsftpd':
-			script => 'ps_'
-		}
+	if $::hostname in [chopin,franck,ravel] {
+		include vsftpd
 	}
 }