[Fusionforge-commits] FusionForge branch Branch_5_2 updated. e5c4ac85262c6be2712aa2fff7c7d43934660fc7

Roland Mas lolando at fusionforge.org
Tue Dec 17 17:39:06 CET 2013

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, Branch_5_2 has been updated
       via  e5c4ac85262c6be2712aa2fff7c7d43934660fc7 (commit)
      from  13e4e1aa82f3f7ac34ad598f8f821bbeda4fa894 (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 -----------------------------------------------------------------
commit e5c4ac85262c6be2712aa2fff7c7d43934660fc7
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 17:38:59 2013 +0100

    Adapt installation procedure for Jessie

diff --git a/src/install/install5_post b/src/install/install5_post
index 0ba0fbd..39e979c 100644
--- a/src/install/install5_post
+++ b/src/install/install5_post
@@ -77,7 +77,7 @@ install5_post_debian()
 		a2enmod $m
-	a2dissite default
+	a2dissite default || a2dissite 000-default
 	service apache2 restart
diff --git a/tests/scripts/fusionforge-build-and-test-deb.sh b/tests/scripts/fusionforge-build-and-test-deb.sh
index 1f743a7..95ed963 100755
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@ -107,7 +107,7 @@ ssh root@$HOST "apt-get update"
 ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -y --force-yes install rsync postgresql-contrib fusionforge-full"
 echo "Set forge admin password"
 ssh root@$HOST "/usr/share/gforge/bin/forge_set_password $FORGE_ADMIN_USERNAME $FORGE_ADMIN_PASSWORD"
-ssh root@$HOST "LANG=C a2dissite default ; LANG=C invoke-rc.d apache2 reload"
+ssh root@$HOST "LANG=C a2dissite default ; LANG=C a2dissite 000-default ; LANG=C invoke-rc.d apache2 reload"
 ssh root@$HOST "(echo [core];echo use_ssl=no) > /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "(echo [moinmoin];echo use_frame=no) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"
 ssh root@$HOST "(echo [mediawiki];echo unbreak_frames=yes) >> /etc/gforge/config.ini.d/zzz-buildbot.ini"


Summary of changes:
 src/install/install5_post                       |    2 +-
 tests/scripts/fusionforge-build-and-test-deb.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


More information about the Fusionforge-commits mailing list