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 56dc6380faea79ed637ef60dd1216b6073543331 (commit)
via 768fda5f9fcc4831db10a1bd2d18dfc925ee0a4e (commit)
from b0fecc5012444a1e780a327bbfdcd750ab7adfc7 (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=56dc6380faea79ed637ef60dd1216b6073543331
commit 56dc6380faea79ed637ef60dd1216b6073543331
Author: Franck Villaume <[email protected]>
Date: Fri Apr 26 17:49:09 2019 +0200
enforce apache2 dependency & specific apache2 mods configuration
diff --git a/src/debian/control.in b/src/debian/control.in
index bfe876b..0f07f07 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -79,7 +79,7 @@ Description: collaborative development tool - database
(remote)
Package: fusionforge-web
Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db-local |
fusionforge-db, libapache2-mpm-itk | apache2-mpm-itk, php-cli | php5-cli,
libapache2-mod-php | libapache2-mod-php5, libphp-simplepie, php-http,
php-http-webdav-server, libmarkdown-php, libjs-jquery-livequery, python,
poppler-utils, openssl, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db-local |
fusionforge-db, apache2, libapache2-mpm-itk | apache2-mpm-itk, php-cli |
php5-cli, libapache2-mod-php | libapache2-mod-php5, libphp-simplepie, php-http,
php-http-webdav-server, libmarkdown-php, libjs-jquery-livequery, python,
poppler-utils, openssl, ${misc:Depends}
Recommends: locales-all, unoconv
Description: collaborative development tool - web part (using Apache)
FusionForge provides many tools to aid collaboration in a
diff --git a/src/post-install.d/web/web.sh b/src/post-install.d/web/web.sh
index f36c474..00f2f01 100755
--- a/src/post-install.d/web/web.sh
+++ b/src/post-install.d/web/web.sh
@@ -116,6 +116,10 @@ case "$1" in
a2enmod mpm_itk
a2enmod mod_access_compat
else
+ if grep -q ^9 /etc/debian_version; then
+ a2dismod mpm_event
+ a2enmod mpm_itk
+ fi
a2enmod php7.0 || a2enmod php5
fi
a2enmod ssl
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=768fda5f9fcc4831db10a1bd2d18dfc925ee0a4e
commit 768fda5f9fcc4831db10a1bd2d18dfc925ee0a4e
Author: Franck Villaume <[email protected]>
Date: Fri Apr 26 17:47:01 2019 +0200
extend the buildbot to support debian9
diff --git a/tests/buildbot/fusionforge-func_tests.sh
b/tests/buildbot/fusionforge-func_tests.sh
index c120aa3..c710e79 100755
--- a/tests/buildbot/fusionforge-func_tests.sh
+++ b/tests/buildbot/fusionforge-func_tests.sh
@@ -105,6 +105,11 @@ case $HOST in
VM=debian8
INSTALL_OS=debian
;;
+ debian9.local)
+ export DIST=stretch
+ VM=debian9
+ INSTALL_OS=debian
+ ;;
centos5.local)
VM=centos5
INSTALL_OS=centos
@@ -118,8 +123,8 @@ case $HOST in
INSTALL_OS=centos
;;
*)
- export DIST=jessie
- VM=debian8
+ export DIST=stretch
+ VM=debian9
INSTALL_OS=debian
;;
esac
-----------------------------------------------------------------------
Summary of changes:
src/debian/control.in | 2 +-
src/post-install.d/web/web.sh | 4 ++++
tests/buildbot/fusionforge-func_tests.sh | 9 +++++++--
3 files changed, 12 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
