X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fftp_upload.pp;h=75bd56856ec6f25f6f928907d2f9f991e627ba9e;hb=e36aaa15b6e11c42c1f2fd23c28acbaae55a0355;hp=d22227ba34bc441970c3ec884918ee927fa85b6a;hpb=fb049765334665723f6c8f1d0916be14579579f8;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp index d22227ba3..75bd56856 100644 --- a/modules/roles/manifests/ftp_upload.pp +++ b/modules/roles/manifests/ftp_upload.pp @@ -1,20 +1,9 @@ class roles::ftp_upload { - - vsftpd::site { 'ftp-upload': - banner => 'ftp.upload.debian.org FTP server', - logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log', - writable => true, - chown_user => dak-unpriv, - root => '/srv/upload.debian.org/ftp', - } - - if $bind6 { - vsftpd::site { 'ftp-upload-v6': - banner => 'ftp.upload.debian.org FTP server', - logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log', - writable => true, - chown_user => dak-unpriv, - root => '/srv/upload.debian.org/ftp', - } - } + vsftpd::site { 'ftp-upload': + banner => 'ftp.upload.debian.org FTP server', + logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log', + writable => true, + chown_user => dak-unpriv, + root => '/srv/upload.debian.org/ftp', + } }