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 97c76f6794182c26412236b11939edfc2bba9c3c (commit)
from 692b6c2b9698bee8a2a0791f5f1a8f57b299cee3 (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=97c76f6794182c26412236b11939edfc2bba9c3c
commit 97c76f6794182c26412236b11939edfc2bba9c3c
Author: Franck Villaume <[email protected]>
Date: Thu Jul 13 09:17:53 2017 +0000
make vsftpd aware of docker
diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 0fa8bd4..d9f612d 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -18,7 +18,6 @@
# You should have received a copy of the GNU General Public License along
# with FusionForge; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-set -e
__postinstall() {
/usr/local/share/fusionforge/post-install.d/common/common.sh configure
diff --git a/src/post-install.d/ftp/ftp.sh b/src/post-install.d/ftp/ftp.sh
index 92f59a3..0becdec 100755
--- a/src/post-install.d/ftp/ftp.sh
+++ b/src/post-install.d/ftp/ftp.sh
@@ -26,12 +26,18 @@ configure_ftpd() {
sed -i -e 's/^anonymous_enable=.*$/anonymous_enable=NO/'
/etc/vsftpd/vsftpd.conf
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
+ fi
}
remove_ftpd() {
sed -i -e 's/^anonymous_enable=NO.*$/anonymous_enable=YES/'
/etc/vsftpd/vsftpd.conf
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
+ fi
}
restart_ftp_service()
-----------------------------------------------------------------------
Summary of changes:
docker/startpoint.sh | 1 -
src/post-install.d/ftp/ftp.sh | 6 ++++++
2 files changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
