this is probably more like it

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 54ed6528471689ca7c14819daf0f5fc6a6bb5a56..77007e1075e710256d67607bcfcae39141f9fce5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -148,7 +148,7 @@ node default {
                munin::check { 'spamassassin': }
        }
 
-       if $::hostname in [chopin,franck,gluck,kassia,klecker,lobos,morricone,ravel,saens,schein,santoro,steffani,villa,wieck,bizet] {
+       if $::hostname in [chopin,franck,kassia,klecker,morricone,ravel,bizet] {
                include vsftpd
        }
 }

diff --git a/modules/roles/files/security_mirror/vsftpd.conf b/modules/roles/files/security_mirror/vsftpd.conf
new file mode 100644 (file)
index 0000000..2cbe373
--- /dev/null
+++ b/modules/roles/files/security_mirror/vsftpd.conf
@@ -0,0 +1,14 @@
+anonymous_enable=YES\r
+connect_from_port_20=NO\r
+connect_from_port_20=YES\r
+dirmessage_enable=NO\r
+dirmessage_enable=YES\r
+ftpd_banner=security.debian.org FTP server (vsftpd)\r
+listen=YES\r
+ls_recurse_enable=YES\r
+pam_service_name=vsftpd\r
+rsa_cert_file=/etc/ssl/certs/vsftpd.pem\r
+secure_chroot_dir=/var/run/vsftpd\r
+setproctitle_enable=YES\r
+xferlog_enable=YES\r
+xferlog_file=/var/log/vsftpd.log\r

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 46f9b5f9463594c0174007c13be7698f76762bed..9b9ec2d2fa1157d06a67dd60fe23034ef51e3039 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -5,4 +5,7 @@ class roles::security_mirror {
                config => 'puppet:///modules/roles/security_mirror/security.debian.org'
        }
 
+       class { 'vsftpd::site':
+               source => 'puppet:///modules/roles/security_mirror/vsftpd.conf'
+       }
 }

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
new file mode 100644 (file)
index 0000000..bc66c95
--- /dev/null
+++ b/modules/vsftpd/manifests/site.pp
@@ -0,0 +1,34 @@
+class vsftpd::site (
+       $source='',
+       $content='',
+       $ensure=present,
+){
+
+       include vsftpd
+
+       if ($source and $content) {
+               fail ( "Can't have both source and content for $name" )
+       }
+
+       case $ensure {
+               present,absent: {}
+               default: { fail ( "Invald ensure `$ensure' for $name" ) }
+       }
+
+       if $source {
+               file { '/etc/vsftpd.conf':
+                       ensure => $ensure,
+                       source => $source,
+                       notify => Service['vsftpd']
+               }
+       } elsif $content {
+               file { '/etc/vsftpd.conf':
+                       ensure  => $ensure,
+                       content => $content,
+                       notify  => Service['vsftpd']
+               }
+       } else {
+               fail ( "Need one of source or content for $name" )
+       }
+
+}