From: Stephen Gran <steve@lobefin.net>
Date: Mon, 23 Apr 2012 07:04:22 +0000 (+0100)
Subject: move logic out of main manifest
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=6f7cf235a2677fdb7043623f25c8d8edaef7568b

move logic out of main manifest

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 77007e10..75bac4cc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -38,7 +38,9 @@ node default {
 		include ganeti2
 	}
 
-	if $::hostname in [finzi,fano,fasch,field] {
+	if $::kernel == Linux {
+		include linux
+	} elsif $::kernel == 'GNU/kFreeBSD' {
 		include kfreebsd
 	}
 
@@ -112,12 +114,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
 	}
diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
new file mode 100644
index 00000000..8977b1b9
--- /dev/null
+++ b/modules/linux/manifests/init.pp
@@ -0,0 +1,5 @@
+class linux {
+	include ferm
+	include ferm::per-host
+	include entropykey
+}