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 48892ccfc2f2378ab0289cf3f0df58362e8eff95 (commit)
from 823c5ea5ab7e0b842579d7f40fd3b887b520bd95 (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=48892ccfc2f2378ab0289cf3f0df58362e8eff95
commit 48892ccfc2f2378ab0289cf3f0df58362e8eff95
Author: Roland Mas <[email protected]>
Date: Tue Oct 8 13:23:06 2019 +0200
Ignore Debian's policy-rc.d if $FF_INSTALL_FORCE_HANDLE_SERVICES=yes
diff --git a/src/post-install.d/common/service.inc
b/src/post-install.d/common/service.inc
index dfaee4e..18db00e 100644
--- a/src/post-install.d/common/service.inc
+++ b/src/post-install.d/common/service.inc
@@ -19,7 +19,7 @@
# Debian-specific behavior for Policy Nazis
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789778
-if [ -e /etc/debian_version ]; then
+if [ -e /etc/debian_version ] && ! [ "$FF_INSTALL_FORCE_HANDLE_SERVICES" = yes
]; then
service () {
invoke-rc.d $@
ret=$?
diff --git a/src/post-install.d/db/server.sh b/src/post-install.d/db/server.sh
index a8b8f98..87165a1 100755
--- a/src/post-install.d/db/server.sh
+++ b/src/post-install.d/db/server.sh
@@ -23,10 +23,6 @@
database_name=$(forge_get_config database_name)
database_user=$(forge_get_config database_user)
-if [ -d /run/systemd/system ]; then
- is_systemd=1
-fi
-
case "$1" in
configure)
# Create default configuration files if needed
@@ -82,14 +78,9 @@ case "$1" in
fi
if [ $restart = 1 ] || ! service postgresql status >/dev/null;
then
- a=restart
- else
- a=reload
- fi
- if [ -n "$is_systemd" ] ; then
- systemctl $a postgresql
+ service postgresql restart
else
- service postgresql $a
+ service postgresql reload
fi
;;
-----------------------------------------------------------------------
Summary of changes:
src/post-install.d/common/service.inc | 2 +-
src/post-install.d/db/server.sh | 13 ++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
