projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install rsyslog instead of sysklogd.
[carnet-upgrade.git]
/
files
/
etc
/
vsftpd.conf.expect
diff --git
a/files/etc/vsftpd.conf.expect
b/files/etc/vsftpd.conf.expect
index
107c7f4
..
e2c9b7f
100644
(file)
--- a/
files/etc/vsftpd.conf.expect
+++ b/
files/etc/vsftpd.conf.expect
@@
-45,6
+45,12
@@
local_umask=022
# go into a certain directory.
dirmessage_enable=YES
#
# go into a certain directory.
dirmessage_enable=YES
#
+# If enabled, vsftpd will display directory listings with the time
+# in your local time zone. The default is to display GMT. The
+# times returned by the MDTM FTP command are also affected by this
+# option.
+use_localtime=YES
+#
# Activate logging of uploads/downloads.
xferlog_enable=YES
#
# Activate logging of uploads/downloads.
xferlog_enable=YES
#
@@
-61,7
+67,8
@@
connect_from_port_20=YES
# below.
#xferlog_file=/var/log/vsftpd.log
#
# below.
#xferlog_file=/var/log/vsftpd.log
#
-# If you want, you can have your log file in standard ftpd xferlog format
+# If you want, you can have your log file in standard ftpd xferlog format.
+# Note that the default log file location is /var/log/xferlog in this case.
#xferlog_std_format=YES
#
# You may change the default value for timing out an idle session.
#xferlog_std_format=YES
#
# You may change the default value for timing out an idle session.
@@
-107,6
+114,7
@@
connect_from_port_20=YES
# You may specify an explicit list of local users to chroot() to their home
# directory. If chroot_local_user is YES, then this list becomes a list of
# users to NOT chroot().
# You may specify an explicit list of local users to chroot() to their home
# directory. If chroot_local_user is YES, then this list becomes a list of
# users to NOT chroot().
+#chroot_local_user=YES
#chroot_list_enable=YES
# (default follows)
#chroot_list_file=/etc/vsftpd.chroot_list
#chroot_list_enable=YES
# (default follows)
#chroot_list_file=/etc/vsftpd.chroot_list
@@
-117,7
+125,6
@@
connect_from_port_20=YES
# the presence of the "-R" option, so there is a strong case for enabling it.
#ls_recurse_enable=YES
#
# the presence of the "-R" option, so there is a strong case for enabling it.
#ls_recurse_enable=YES
#
-#
# Debian customization
#
# Some of vsftpd's settings don't fit the Debian filesystem layout by
# Debian customization
#
# Some of vsftpd's settings don't fit the Debian filesystem layout by
@@
-127,11
+134,11
@@
connect_from_port_20=YES
# directory should not be writable by the ftp user. This directory is used
# as a secure chroot() jail at times vsftpd does not require filesystem
# access.
# directory should not be writable by the ftp user. This directory is used
# as a secure chroot() jail at times vsftpd does not require filesystem
# access.
-secure_chroot_dir=/var/run/vsftpd
+secure_chroot_dir=/var/run/vsftpd/empty
#
# This string is the name of the PAM service vsftpd will use.
pam_service_name=vsftpd
#
# This option specifies the location of the RSA certificate to use for SSL
# encrypted connections.
#
# This string is the name of the PAM service vsftpd will use.
pam_service_name=vsftpd
#
# This option specifies the location of the RSA certificate to use for SSL
# encrypted connections.
-rsa_cert_file=/etc/ssl/certs/vsftpd.pem
+rsa_cert_file=/etc/ssl/private/vsftpd.pem