From: Stephen Gran <steve@lobefin.net>
Date: Sun, 22 Apr 2012 19:26:00 +0000 (+0100)
Subject: start a vsftpd module
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=47b37f6a9bbb69e5d90ea7e44237618c14b90608

start a vsftpd module

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 18e23772..957d9a21 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -148,13 +148,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,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,valente,villa,wieck,bizet] {
+		include vsftpd
 	}
 }
diff --git a/modules/ferm/manifests/ftp.pp b/modules/ferm/manifests/ftp.pp
deleted file mode 100644
index 51d79fb8..00000000
--- a/modules/ferm/manifests/ftp.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class ferm::ftp {
-	@ferm::rule { 'dsa-ftp':
-		domain      => '(ip ip6)',
-		description => 'Allow ftp access',
-		rule        => '&SERVICE(tcp, 21)',
-	}
-}
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index b33ace6a..5f175260 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,10 +3,6 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,valente,villa,wieck,bizet] {
-		include ferm::ftp
-	}
-
 	case $::hostname {
 		piatti,samosa: {
 			@ferm::rule { 'dsa-udd-stunnel':
diff --git a/modules/vsftpd/manifests/init.pp b/modules/vsftpd/manifests/init.pp
new file mode 100644
index 00000000..9ca68bfd
--- /dev/null
+++ b/modules/vsftpd/manifests/init.pp
@@ -0,0 +1,24 @@
+class vsftpd {
+
+	package { 'vsftpd':
+		ensure => installed
+	}
+	package { 'logtail':
+		ensure => installed
+	}
+
+	service { 'vsftpd':
+		ensure => running
+	}
+
+	munin::check { 'vsftpd': }
+	munin::check { 'ps_vsftpd':
+		script => 'ps_'
+	}
+
+	@ferm::rule { 'dsa-ftp':
+		domain      => '(ip ip6)',
+		description => 'Allow ftp access',
+		rule        => '&SERVICE(tcp, 21)',
+	}
+}