this should be under a role name

[dsa-puppet.git] / modules / roles / files / security_mirror / vsftpd.conf

diff --git a/modules/roles/files/security_mirror/vsftpd.conf b/modules/roles/files/security_mirror/vsftpd.conf
index 2cbe373d2e491cf6af39db13fcc8a4ec322c1e0b..e68fe1951f175d9703d3526a733d7f84ecfbbaf8 100644 (file)
--- a/modules/roles/files/security_mirror/vsftpd.conf
+++ b/modules/roles/files/security_mirror/vsftpd.conf
@@ -1,14 +1,12 @@
-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
+anonymous_enable=YES
+xferlog_enable=YES
+secure_chroot_dir=/var/run/vsftpd
+pam_service_name=vsftpd
+rsa_cert_file=/etc/ssl/certs/vsftpd.pem
+
+setproctitle_enable=YES
+dirmessage_enable=NO
+connect_from_port_20=NO
+xferlog_file=/var/log/ftp/vsftpd-security.debian.org.log
+ls_recurse_enable=YES
+ftpd_banner=security.debian.org FTP server (vsftpd)