[Fusionforge-commits] FusionForge branch master updated. 1d24984f47c331cd7d36ff637bd5d06b281c5c21

Roland Mas lolando at fusionforge.org
Tue Dec 17 17:39:45 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, master has been updated
       via  1d24984f47c331cd7d36ff637bd5d06b281c5c21 (commit)
       via  e5c4ac85262c6be2712aa2fff7c7d43934660fc7 (commit)
      from  7df2d72616bd173937a2c03b3dc8c64f950b6ff7 (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 1d24984f47c331cd7d36ff637bd5d06b281c5c21
Merge: 7df2d72 e5c4ac8
Author: Roland Mas <lolando at debian.org>
Date:   Tue Dec 17 17:39:33 2013 +0100

    Merged from 5.2: Adapt installation procedure for Jessie

diff --cc tests/scripts/fusionforge-build-and-test-deb.sh
index f5d3872,95ed963..40c814c
--- a/tests/scripts/fusionforge-build-and-test-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-deb.sh
@@@ -121,10 -104,10 +121,10 @@@ sleep 
  ssh root@$HOST "apt-get update"
  
  # Install fusionforge
 -ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -y --force-yes install rsync postgresql-contrib fusionforge-full"
 +ssh root@$HOST "UCF_FORCE_CONFFNEW=yes DEBIAN_FRONTEND=noninteractive LANG=C apt-get -o debug::pkgproblemresolver=true -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(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list