github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 13:01:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix for aditional ftp accounts

Browse source
This commit is contained in:
Serghey Rodin 2016-12-08 16:20:48 +02:00
commit 039a989fb2
5 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-add-web-domain-ftp
View file

@ -51,7 +51,7 @@ is_password_valid
get_domain_values 'web' get_domain_values 'web'
# Defining ftp user shell # Defining ftp user shell
shell='/sbin/nologin' shell=$(which nologin)
if [ ! -z "$FTP_SHELL" ]; then if [ ! -z "$FTP_SHELL" ]; then
shell=$FTP_SHELL shell=$FTP_SHELL
fi fi

2
func/rebuild.sh
View file

@ -268,7 +268,7 @@ rebuild_web_domain_conf() {
# Adding ftp users # Adding ftp users
if [ -z "$FTP_SHELL" ]; then if [ -z "$FTP_SHELL" ]; then
shell='/sbin/nologin' shell=$(which nologin)
if [ -e "/usr/bin/rssh" ]; then if [ -e "/usr/bin/rssh" ]; then
shell='/usr/bin/rssh' shell='/usr/bin/rssh'
fi fi

3
install/vst-install-debian.sh
View file

@ -886,6 +886,9 @@ if [ "$vsftpd" = 'yes' ]; then
update-rc.d vsftpd defaults update-rc.d vsftpd defaults
service vsftpd start service vsftpd start
check_result $? "vsftpd start failed" check_result $? "vsftpd start failed"
# To be deleted after release 0.9.8-18
echo "/sbin/nologin" >> /etc/shells
fi fi

3
install/vst-install-rhel.sh
View file

@ -937,6 +937,9 @@ if [ "$vsftpd" = 'yes' ]; then
chkconfig vsftpd on chkconfig vsftpd on
service vsftpd start service vsftpd start
check_result $? "vsftpd start failed" check_result $? "vsftpd start failed"
# To be deleted after release 0.9.8-18
echo "/sbin/nologin" >> /etc/shells
fi fi

3
install/vst-install-ubuntu.sh
View file

@ -901,6 +901,9 @@ if [ "$vsftpd" = 'yes' ]; then
update-rc.d vsftpd defaults update-rc.d vsftpd defaults
service vsftpd start service vsftpd start
check_result $? "vsftpd start failed" check_result $? "vsftpd start failed"
# To be deleted after release 0.9.8-18
echo "/sbin/nologin" >> /etc/shells
fi fi