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 e4070ea146f2d4eb9ff53b7b33b13cb8bd022508 (commit)
from 4d15d4b9a131639532e945d7eeff28b8f1d70912 (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=e4070ea146f2d4eb9ff53b7b33b13cb8bd022508
commit e4070ea146f2d4eb9ff53b7b33b13cb8bd022508
Author: Franck Villaume <[email protected]>
Date: Fri Apr 16 11:49:02 2021 +0000
fix installation with SUSE support
diff --git a/autoinstall/build.sh b/autoinstall/build.sh
index e078ddc..be5eea6 100755
--- a/autoinstall/build.sh
+++ b/autoinstall/build.sh
@@ -200,7 +200,7 @@ if [ -e /etc/debian_version ]; then
build_deb
elif [ -e /etc/redhat-release ]; then
build_rpm
-elif [ -e /etc/os-release ]; then
+elif [[ ! -z `cat /etc/os-release | grep 'SUSE'` ]]; then
build_suse_rpm
else
echo "Automated package building is not supported for this distribution."
diff --git a/autoinstall/install-gui.sh b/autoinstall/install-gui.sh
index 32caa03..553cf1a 100755
--- a/autoinstall/install-gui.sh
+++ b/autoinstall/install-gui.sh
@@ -7,7 +7,7 @@ if [ -e /etc/debian_version ]; then
apt-get install -y xorg nodm xfce4 gnome-icon-theme
sed -i -e 's/^NODM_ENABLED=.*/NODM_ENABLED=true/' -e
's/^NODM_USER=.*/NODM_USER=root/' /etc/default/nodm
/etc/init.d/nodm restart
-elif [ -e /etc/os-release ]; then
+elif [[ ! -z `cat /etc/os-release | grep 'SUSE'`]]; then
suse_check_release
suse_install_rpms patterns-openSUSE-xfce_basis
else
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index eba10dc..90c5b0c 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -4,7 +4,7 @@
# Copyright (C) 2011, 2019, Roland Mas
# Copyright (C) 2011, Olivier Berger - Institut Telecom
# Copyright (C) 2014, Inria (Sylvain Beucler)
-# Copyright 2017,2019, Franck Villaume - TrivialDev
+# Copyright 2017,2019,2021 Franck Villaume - TrivialDev
#
# This file is part of FusionForge. FusionForge is free software;
# you can redistribute it and/or modify it under the terms of the
@@ -82,7 +82,7 @@ if [ -e /etc/debian_version ]; then
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
-elif [ -e /etc/os-release ]; then
+elif [[ ! -z `cat /etc/os-release | grep 'SUSE'` ]]; then
suse_check_release
suse_install_repos
suse_install_rpms make gettext-runtime php7 php7-gettext php7-posix
php7-pgsql \
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index 0ac25ec..de29af6 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -54,7 +54,7 @@ if [ -e /etc/debian_version ]; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
fi
-elif [ -e /etc/os-release ]; then
+elif [[ ! -z `cat /etc/os-release | grep "SUSE"` ]]; then
suse_check_release
suse_install_repos
if rpm -q fusionforge >/dev/null ; then
diff --git a/autoinstall/update.sh b/autoinstall/update.sh
index 6845159..413fad9 100755
--- a/autoinstall/update.sh
+++ b/autoinstall/update.sh
@@ -4,7 +4,7 @@
if [ -e /etc/debian_version ]; then
aptitude update
aptitude -y dist-upgrade
-elif [ -e /etc/os-release ]; then
+elif [[ ! -z `cat /etc/os-release | grep "SUSE"` ]]; then
zypper update -y
else
yum upgrade
diff --git a/src/GNUmakefile.defaults b/src/GNUmakefile.defaults
index 1fa1dc3..46095ca 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/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_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [
-e /etc/debian_version ]; then echo 'www-data'; elif [[ ! -z `cat
/etc/os-release | grep "SUSE"` ]]; 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 [[ ! -z `cat
/etc/os-release| grep "SUSE"` ]]; 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)
+ssh_service=$(shell if [ -e /etc/debian_version ]; then echo 'ssh'; else echo
'sshd'; fi)
diff --git a/src/post-install.d/db/server.sh b/src/post-install.d/db/server.sh
index a7bbd7c..27fd585 100755
--- a/src/post-install.d/db/server.sh
+++ b/src/post-install.d/db/server.sh
@@ -34,9 +34,9 @@ case "$1" in
fi
chkconfig postgresql on
fi
- if [ -e /etc/os-release ]; then
+ if [[ ! -z `cat /etc/os-release | grep "SUSE"` ]]; then
service postgresql start # creates initial db
- systemctl enable postgresql || chkconfig postgresql on
+ chkconfig postgresql on
fi
pg_hba=$(ls /etc/postgresql/*/*/pg_hba.conf
/var/lib/pgsql/data/pg_hba.conf 2>/dev/null | tail -1)
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index b7a832c..abb6807 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -119,7 +119,7 @@ case "$1" in
if [ -x /usr/sbin/a2enmod ]; then
a2enmod version 2>/dev/null || true # opensuse..
a2enmod macro
- if [ -e /etc/os-release ]; then
+ if [[ ! -z `cat /etc/os-release | grep "SUSE"` ]]; then
a2enmod php7
a2enmod mpm_itk
a2enmod mod_access_compat
-----------------------------------------------------------------------
Summary of changes:
autoinstall/build.sh | 2 +-
autoinstall/install-gui.sh | 2 +-
autoinstall/install-src.sh | 4 ++--
autoinstall/install.sh | 2 +-
autoinstall/update.sh | 2 +-
src/GNUmakefile.defaults | 6 +++---
src/post-install.d/db/server.sh | 4 ++--
src/post-install.d/web/web.sh | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
