[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1beta1-116-gc35eb68
Franck Villaume
nerville at libremir.placard.fr.eu.org
Wed Jan 31 14:55:36 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via c35eb68f3e2dea015174d5d40cb1e9a09cbee7d5 (commit)
from e3f70dffb2d3222c67f4788b6984c0e69d985e2a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c35eb68f3e2dea015174d5d40cb1e9a09cbee7d5
commit c35eb68f3e2dea015174d5d40cb1e9a09cbee7d5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Wed Jan 31 13:55:22 2018 +0000
fix post-install ftp, docker support
diff --git a/src/post-install.d/ftp/ftp.sh b/src/post-install.d/ftp/ftp.sh
index cc06c77..82e6a57 100755
--- a/src/post-install.d/ftp/ftp.sh
+++ b/src/post-install.d/ftp/ftp.sh
@@ -29,7 +29,7 @@ configure_ftpd() {
sed -i -e 's/^anonymous_enable=.*$/anonymous_enable=NO/' $vsftpdconffile
sed -i -e 's/^#ftpd_banner=.*$/ftpd_banner=Welcome to FusionForge FTP server/' $vsftpdconffile
sed -i -e 's/^#chroot_local_user=.*$/chroot_local_user=YES/' $vsftpdconffile
- if [[ $is_docker ]]; then
+ if [[ ! -n $is_docker ]]; then
if [[ -z `grep 'background=NO' $vsftpdconffile` ]];then
echo 'background=NO' >> $vsftpdconffile
fi
@@ -40,7 +40,7 @@ remove_ftpd() {
sed -i -e 's/^anonymous_enable=NO.*$/anonymous_enable=YES/' $vsftpdconffile
sed -i -e 's/^ftpd_banner=Welcome.*$/#ftpd_banner=Welcome to blah FTP service./' $vsftpdconffile
sed -i -e 's/^chroot_local_user=YES.*$/#chroot_local_user=NO/' $vsftpdconffile
- if [[ $is_docker ]]; then
+ if [[ ! -n $is_docker ]]; then
if [[ ! -z `grep 'background=NO' $vsftpdconffile` ]];then
sed -i '$d' $vsftpdconffile
fi
@@ -48,7 +48,7 @@ remove_ftpd() {
}
restart_ftp_service() {
- if [[ $is_docker ]]; then
+ if [[ ! -n $is_docker ]]; then
killall vsftpd >/dev/null 2>&1
else
service vsftpd restart
-----------------------------------------------------------------------
Summary of changes:
src/post-install.d/ftp/ftp.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list