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 4a58e339a80e22c7b0ba62a65394d7bd528a38c2 (commit)
from fea48f82a38b91110cd46b86fb2f7f95e763ce2b (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=4a58e339a80e22c7b0ba62a65394d7bd528a38c2
commit 4a58e339a80e22c7b0ba62a65394d7bd528a38c2
Author: Franck Villaume <[email protected]>
Date: Thu Apr 15 16:29:28 2021 +0000
fix debian apache user/group + use systemctl when possible
diff --git a/src/GNUmakefile.defaults b/src/GNUmakefile.defaults
index 91979fe..1fa1dc3 100644
--- a/src/GNUmakefile.defaults
+++ b/src/GNUmakefile.defaults
@@ -43,7 +43,7 @@ INSTALL=install
CP_R=cp -r --preserve=timestamps
# Hard-coded detection of distro-specific Apache configuration
-apache_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/os-release ]; then echo 'wwwrun'; else echo 'www-data'; fi)
-apache_group=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/os-release ]; then echo 'www'; else echo 'www-data'; fi)
+apache_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/debian_version ]; then echo 'www-data'; elif [ -e /etc/os-release ];
then echo 'wwwrun'; else echo 'apache'; fi)
+apache_group=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/debian_version ]; then echo 'www-data'; elif [ -e /etc/os-release ];
then echo 'www'; else echo 'apache'; fi)
apache_service=$(shell if [ -e /etc/redhat-release ]; then echo 'httpd'; else
echo 'apache2'; fi)
ssh_service=$(shell if [ -e /etc/redhat-release ]; then echo 'sshd'; elif [ -e
/etc/os-release ]; then echo 'sshd'; else echo 'ssh'; fi)
diff --git a/src/post-install.d/db/server.sh b/src/post-install.d/db/server.sh
index c189217..a7bbd7c 100755
--- a/src/post-install.d/db/server.sh
+++ b/src/post-install.d/db/server.sh
@@ -36,7 +36,7 @@ case "$1" in
fi
if [ -e /etc/os-release ]; then
service postgresql start # creates initial db
- chkconfig postgresql on
+ systemctl enable postgresql || chkconfig postgresql on
fi
pg_hba=$(ls /etc/postgresql/*/*/pg_hba.conf
/var/lib/pgsql/data/pg_hba.conf 2>/dev/null | tail -1)
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile.defaults | 4 ++--
src/post-install.d/db/server.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
