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, master has been updated
via 69ce94fa4bee5d4288142cdf9a4fdb69e27717a7 (commit)
from 97c76f6794182c26412236b11939edfc2bba9c3c (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=69ce94fa4bee5d4288142cdf9a4fdb69e27717a7
commit 69ce94fa4bee5d4288142cdf9a4fdb69e27717a7
Author: Franck Villaume <[email protected]>
Date: Thu Jul 13 09:51:41 2017 +0000
ftp post-install: set correctly background process
diff --git a/src/post-install.d/ftp/ftp.sh b/src/post-install.d/ftp/ftp.sh
index 0becdec..9abd625 100755
--- a/src/post-install.d/ftp/ftp.sh
+++ b/src/post-install.d/ftp/ftp.sh
@@ -27,7 +27,7 @@ configure_ftpd() {
sed -i -e 's/^#ftpd_banner=.*$/ftpd_banner=Welcome to FusionForge FTP
server/' /etc/vsftpd/vsftpd.conf
sed -i -e 's/^chroot_local_user=.*$/chroot_local_user=YES/'
/etc/vsftpd/vsftpd.conf
if [[ $is_docker ]]; then
- sed -i -e 's/^background=.*$/background=NO/' /etc/vsftpd/vsftpd.conf
+ echo 'background=NO' >> /etc/vsftpd/vsftpd.conf
fi
}
@@ -36,7 +36,7 @@ remove_ftpd() {
sed -i -e 's/^ftpd_banner=Welcome.*$/#ftpd_banner=Welcome to blah FTP
service./' /etc/vsftpd/vsftpd.conf
sed -i -e 's/^chroot_local_user=YES.*$/chroot_local_user=NO/'
/etc/vsftpd/vsftpd.conf
if [[ $is_docker ]]; then
- sed -i -e 's/^background=NO.*$/background=YES/' /etc/vsftpd/vsftpd.conf
+ sed -i '$d' /etc/vsftpd/vsftpd.conf
fi
}
-----------------------------------------------------------------------
Summary of changes:
src/post-install.d/ftp/ftp.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
