From: Stephen Gran Date: Sat, 28 Apr 2012 09:16:12 +0000 (+0100) Subject: xinetd means listen=no X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f9fb7de3c5967ecbef88e59a2f4b2ffe97edfc91;p=mirror%2Fdsa-puppet.git xinetd means listen=no Signed-off-by: Stephen Gran --- diff --git a/modules/roles/files/backports_master/vsftpd.conf b/modules/roles/files/backports_master/vsftpd.conf index cbabef1c2..683b983fe 100644 --- a/modules/roles/files/backports_master/vsftpd.conf +++ b/modules/roles/files/backports_master/vsftpd.conf @@ -1,7 +1,3 @@ -listen_ipv6=yes -# listen=no means it'll listen on both ipv6 and ipv4 due to net.ipv6.bindv6only=0 -listen=no - anonymous_enable=YES write_enable=YES anon_root=/srv/backports-upload diff --git a/modules/roles/files/ftp_upload/vsftpd.conf b/modules/roles/files/ftp_upload/vsftpd.conf index e55f32e3f..089aaebdf 100644 --- a/modules/roles/files/ftp_upload/vsftpd.conf +++ b/modules/roles/files/ftp_upload/vsftpd.conf @@ -1,6 +1,5 @@ ftpd_banner=ftp.upload.debian.org FTP server -listen=YES max_clients=100 anonymous_enable=YES diff --git a/modules/roles/files/security_mirror/vsftpd.conf b/modules/roles/files/security_mirror/vsftpd.conf index 7a69d8263..ab5a26823 100644 --- a/modules/roles/files/security_mirror/vsftpd.conf +++ b/modules/roles/files/security_mirror/vsftpd.conf @@ -1,4 +1,3 @@ -listen=YES anonymous_enable=YES xferlog_enable=YES secure_chroot_dir=/var/run/vsftpd