start a vsftpd module

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 18e2377..957d9a2 100644 (file)
--- 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 (file)
index 51d79fb..0000000
--- 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 b33ace6..5f17526 100644 (file)
--- 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 (file)
index 0000000..9ca68bf
--- /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)',
+       }
+}