[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1944-g029d464

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 18 19:50:18 CEST 2017


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  029d46459634dc7159508f0dab9136736d66e475 (commit)
      from  ef6f96e71f25f7074fd3f147b54c07f7c4c83f4e (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=029d46459634dc7159508f0dab9136736d66e475

commit 029d46459634dc7159508f0dab9136736d66e475
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 18 19:27:13 2017 +0200

    in docker container: kill httpd and not call service

diff --git a/docker/startpoint.sh b/docker/startpoint.sh
index 1e659ad..745eed8 100644
--- a/docker/startpoint.sh
+++ b/docker/startpoint.sh
@@ -28,6 +28,7 @@ __postinstall() {
 
 __zzzzlocalini() {
 echo '[core]' > /etc/fusionforge/config.ini.d/zzzz-local.ini
+echo 'is_docker = 1' >> /etc/fusionforge/config.ini.d/zzzz-local.ini
 if [[ ! -z ${PORT_HTTP} ]]; then
    echo 'http_port = '${PORT_HTTP} >> /etc/fusionforge/config.ini.d/zzzz-local.ini
 fi
diff --git a/src/common/include/cron_utils.php b/src/common/include/cron_utils.php
index 64e86c5..6e89c04 100644
--- a/src/common/include/cron_utils.php
+++ b/src/common/include/cron_utils.php
@@ -117,7 +117,11 @@ function cron_reload_nscd() {
 }
 
 function cron_reload_apache() {
-        system("service apache2 reload || service httpd reload >/dev/null 2>&1");
+	if (forge_get_config('is_docker')) {
+		system('killall httpd >/dev/null 2>&1');
+	} else {
+		system("service apache2 reload || service httpd reload >/dev/null 2>&1");
+	}
 }
 
 function cron_regen_apache_auth() {

-----------------------------------------------------------------------

Summary of changes:
 docker/startpoint.sh              | 1 +
 src/common/include/cron_utils.php | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list