X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=86bec7d2333a5166bec32b7ba0a54c9165bc889c;hb=d370164fe3b1d0e930329bc593d39cd6316b2ad2;hp=b9382e2606f90e215466b0c42918bd5faffce49a;hpb=87db6fdf68db406ed80a5d6c8bf89e4f4428b365;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index b9382e26..86bec7d2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,18 +29,23 @@ node default {
 	include ntp
 	include ntpdate
 	include ssl
-	include motd
 	include hardware
 	include nagios::client
 	include resolv
 	include roles
+	include motd
 	include unbound
 	include bacula::client
+	include autofs
 
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi,czerny] {
+	if $::hostname in [pasquini,tristano,bertali,boito,rossini,dijkstra,luchesi,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] {
 		include ganeti2
 	}
 
+	if $::hostname in [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,rossini] {
+		include multipath
+	}
+
 	if $::hostname == 'dinis' {
 		include bacula::director
 	} else {
@@ -82,7 +87,7 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
+	if $::hostname in [ravel,senfl,orff,draghi,diamond,rietz] {
 		include named::authoritative
 	} elsif $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
@@ -92,7 +97,7 @@ node default {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach] {
+	if $::hostname in [beethoven,spohr,stabile,beach,glinka,milanollo] {
 		include nfs-server
 	}
 
@@ -108,7 +113,9 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
@@ -122,7 +129,7 @@ node default {
 		munin::check { 'spamassassin': }
 	}
 
-        if $::hoster {
+	if $::hoster {
 		if $::hoster in [ynic] {
 			include lldp
 		}