From b072479b53b327be8ef8625129153caa12f7d2b9 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Mon, 24 Jun 2013 11:17:56 +0300 Subject: [PATCH] check vsftpd.conf in common locations --- bin/v-change-sys-ip-nat | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index d4e1d0263..004d33250 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -43,9 +43,19 @@ else update_ip_value '$NAT' "$nat_ip" fi -# Change vsftpd config +# Check ftp system if [ "$FTP_SYSTEM" = 'vsftpd' ]; then - conf="/etc/vsftpd/vsftpd.conf" + + # Find configuration + if [ -e '/etc/vsftpd/vsftpd.conf' ]; then + conf='/etc/vsftpd/vsftpd.conf' + fi + + if [ -e '/etc/vsftpd.conf' ]; then + conf='/etc/vsftpd.conf' + fi + + # Update config if [ -z "$(grep pasv_address $conf)" ]; then if [ ! -z "$nat_ip" ]; then echo "pasv_address=$nat_ip" >> $conf