diff --git a/baseimage/initializeBaseUbuntuImage.sh b/baseimage/initializeBaseUbuntuImage.sh index 2c05e71a2..3ce029977 100755 --- a/baseimage/initializeBaseUbuntuImage.sh +++ b/baseimage/initializeBaseUbuntuImage.sh @@ -43,6 +43,8 @@ apt-get -y install \ mysql-server-5.7 \ nginx-full \ openssh-server \ + proftpd-basic \ + proftpd-mod-ldap \ pwgen \ resolvconf \ sudo \ diff --git a/scripts/installer.sh b/scripts/installer.sh index 63463c756..1278d6e5c 100755 --- a/scripts/installer.sh +++ b/scripts/installer.sh @@ -57,7 +57,7 @@ if [[ $(docker version --format {{.Client.Version}}) != "18.09.2" ]]; then fi echo "==> installer: updating proftpd" -if [[ ! `proftpd --version | grep "1.3.5"` ]]; then +if [[ "$(proftpd --version)" != *"1.3.5"* ]]; then echo "Install proftpd" apt install -y proftpd-basic=1.3.5e-1build1 proftpd-mod-ldap=1.3.5e-1build1 systemctl stop proftpd diff --git a/setup/start/proftpd.conf b/setup/start/proftpd.conf index 695d78698..c0130480e 100644 --- a/setup/start/proftpd.conf +++ b/setup/start/proftpd.conf @@ -18,7 +18,7 @@ TimeoutNoTransfer 600 TimeoutStalled 600 TimeoutIdle 1200 -DisplayLogin welcome.msg +DisplayLogin welcome.msg DisplayChdir .message true ListOptions "-l"