X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=bb8f2c2e3299dcadac3574c6839058fb990bca9c;hb=780ac895583acf302fa1e62f51aa98ff47a4cbff;hp=ce1ddaf681c208e6e42ce93a571927f08c00745c;hpb=6710ef26e1c124e536aef0cecd742fe27586ea63;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index ce1ddaf68..bb8f2c2e3 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,
 }
@@ -30,7 +26,6 @@ node default {
 	include ssh
 	include debian-org
 	include monit
-	include apt-keys
 	include ntp
 	include ntpdate
 	include ssl
@@ -39,7 +34,13 @@ node default {
 	include nagios::client
 	include resolv
 
-	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
 	}
 
@@ -53,6 +54,8 @@ node default {
 		} else {
 			include exim
 		}
+	} else {
+		include postfix
 	}
 
 	if $::lsbdistcodename != 'lenny' {
@@ -91,6 +94,18 @@ node default {
 		include roles::backports_mirror
 	}
 
+	if getfromhash($site::nodeinfo, 'ftp.d.o') {
+		include roles::ftp
+	}
+
+	if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
+		include roles::ftp_upload
+	}
+
+	if $::hostname in [bizet,morricone] {
+		include roles::backports_master
+	}
+
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
@@ -111,12 +126,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
 	}
@@ -147,13 +156,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
 	}
 }