diff --git a/entry.sh b/entry.sh index 9f11726..a97114d 100755 --- a/entry.sh +++ b/entry.sh @@ -36,13 +36,6 @@ if [[ -n "${FTP_USERS_ROOT}" ]]; then sed -i 's/local_root=.*/local_root=\/srv\/$USER/' /etc/vsftpd*.conf fi -# Support setting the passive address -if [[ -n "$FTP_PASV_ADDRESS" ]]; then - for f in /etc/vsftpd*.conf; do - echo "pasv_address=${FTP_PASV_ADDRESS}" >> "$f" - done -fi - # Manage /srv permissions if [[ -n "${FTP_CHOWN_ROOT}" ]]; then chown ftp:ftp /srv diff --git a/vsftpd.conf b/vsftpd.conf index 1421cf2..c05cfc8 100644 --- a/vsftpd.conf +++ b/vsftpd.conf @@ -35,5 +35,5 @@ connect_from_port_20=YES listen=YES tcp_wrappers=YES pasv_address=${FTP_PASV_ADDRESS} -pasv_min_port=${FTP_PASV_MIN_PORT:-4559} -pasv_max_port=${FTP_PASV_MAX_PORT:-4564} +pasv_min_port=${FTP_PASV_MIN_PORT} +pasv_max_port=${FTP_PASV_MAX_PORT} diff --git a/vsftpd_ssl.conf b/vsftpd_ssl.conf index 284a31f..4f94aeb 100644 --- a/vsftpd_ssl.conf +++ b/vsftpd_ssl.conf @@ -35,8 +35,8 @@ connect_from_port_20=YES listen=YES tcp_wrappers=YES pasv_address=${FTP_PASV_ADDRESS} -pasv_min_port=${FTP_PASV_MIN_PORT:-4559} -pasv_max_port=${FTP_PASV_MAX_PORT:-4564} +pasv_min_port=${FTP_PASV_MIN_PORT} +pasv_max_port=${FTP_PASV_MAX_PORT} # SSL ssl_enable=Yes