X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3d46f4ee0c6ea8ae0022611018750a7f455e377d;hb=2c62001610ba34a92b56c5abcc0145eee7d355be;hp=29f9d5aa49d9e940aec00b60a6511da4ef68cccc;hpb=501e88f916b62cdc232b204457a82ee77ab089b2;p=dsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 29f9d5aa..3d46f4ee 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
+	include lvm
+	include multipath
+	include roles::pubsub::client
 
-	if $::hostname in [pasquini,tristano,bertali,boito,byrd,clementi] {
+	if $::hostname in [pasquini,tristano,bertali,boito,rossini,salieri,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 == 'dinis' {
 		include bacula::director
 	} else {
@@ -53,7 +58,7 @@ node default {
 		}
 	}
 
-	if $::hostname == 'beethoven' {
+	if $::hostname == 'backuphost' {
 		include bacula::storage
 	}
 
@@ -82,20 +87,22 @@ node default {
 		include apache2
 	}
 
-	if $::hostname in [ravel,senfl,orff,draghi,diamond] {
-		include named::authoritative
-	} elsif $::hostname in [geo1,geo2,geo3] {
+	if $::hostname in [geo1,geo2,geo3] {
 		include named::geodns
 	}
 
-	if $::hostname in [diabelli,nono,spohr] {
+	if $::hostname in [diabelli,nono] {
 		include dacs
 	}
 
-	if $::hostname in [beethoven,spohr,stabile,beach] {
+	if $::hostname in [stabile,beach,glinka,milanollo,rautavaara] {
 		include nfs-server
 	}
 
+	if $::hostname == 'vieuxtemps' {
+		include varnish
+	}
+
 	if $::brokenhosts {
 		include hosts
 	}
@@ -104,21 +111,25 @@ node default {
 		include portforwarder
 	}
 
-	include samhain
+	if $::samhain {
+		include samhain
+	}
 
 	if $::hostname in [chopin,geo3,soler,wieck] {
 		include debian-org::radvd
 	}
 
-	if ($::postgres84 or $::postgres90) {
+	if ($::postgres) {
 		include postgres
 	}
 
-	if $::hostname in ['beethoven', 'berlioz', 'biber', 'diabelli', 'dinis', 'draghi', 'widor', 'wolkenstein'] {
-		@@bacula::node { $::fqdn: }
-	}
-
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
+
+	if $::hoster {
+		if $::hoster in [ynic] {
+			include lldp
+		}
+	}
 }