[Fusionforge-commits] FusionForge branch master updated. ee65c5bc64a37cfb3fea331a16484b0ae6e5fc7e

Roland Mas lolando at fusionforge.org
Mon Dec 16 18:34:55 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  ee65c5bc64a37cfb3fea331a16484b0ae6e5fc7e (commit)
      from  f1128490d4aa8868fd6cf0d253a51b3adbba4858 (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 ee65c5bc64a37cfb3fea331a16484b0ae6e5fc7e
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 16 17:55:52 2013 +0100

    Source installs should go to /opt/gforge, not /opt/gforge/src

diff --git a/src/etc/config.ini-opt b/src/etc/config.ini-opt
index 5246849..97605da 100644
--- a/src/etc/config.ini-opt
+++ b/src/etc/config.ini-opt
@@ -1,9 +1,9 @@
 [core]
 forge_name = FusionForge
 
-source_path = /opt/gforge/src
-binary_path = /opt/gforge/src/utils
-plugins_path = /opt/gforge/src/plugins
+source_path = /opt/gforge
+binary_path = /opt/gforge/utils
+plugins_path = /opt/gforge/plugins
 data_path = /var/lib/gforge
 config_path = /etc/gforge
 log_path = /var/log/gforge
diff --git a/src/install/install5_post b/src/install/install5_post
index 0ba0fbd..c4e0fea 100644
--- a/src/install/install5_post
+++ b/src/install/install5_post
@@ -63,11 +63,11 @@ install5_post_debian()
 
         for i in secrets.inc vhost-list.inc vhost-main.inc vhost-projects.inc ; do
             if [ ! -e /etc/gforge/httpd.conf.d/$i ] ; then
-                cp /opt/gforge/src/etc/httpd.conf.d-opt/$i /etc/gforge/httpd.conf.d/$i
+                cp /opt/gforge/etc/httpd.conf.d-opt/$i /etc/gforge/httpd.conf.d/$i
                 if [ $i = "secrets.inc" ] ; then
                     chmod 700 /etc/gforge/httpd.conf.d/$i
                 fi
-                PATH=/opt/gforge/src/utils:$PATH manage-apache-config.sh install
+                PATH=/opt/gforge/utils:$PATH manage-apache-config.sh install
                 mv /etc/gforge/httpd.conf.d/$i.generated /etc/gforge/httpd.conf.d/$i
             fi
         done
diff --git a/src/utils/manage-apache-config.sh b/src/utils/manage-apache-config.sh
index 6a2dab3..e6018af 100755
--- a/src/utils/manage-apache-config.sh
+++ b/src/utils/manage-apache-config.sh
@@ -84,7 +84,7 @@ EOF
 	mkdir -p httpd.conf.d-opt
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
 	    sed -e 's,{core/config_path},/etc/gforge,g' \
-		-e 's,{core/source_path},/opt/gforge/src,g' \
+		-e 's,{core/source_path},/opt/gforge,g' \
 		-e 's,{core/data_path},/var/lib/gforge,g' \
 		-e 's,{core/log_path},/var/log/gforge,g' \
 		-e 's,{core/chroot},/var/lib/gforge/chroot,g' \
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos.sh b/tests/scripts/fusionforge-build-and-test-src-cos.sh
index 0c7dc34..c92dae7 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos.sh
@@ -24,10 +24,10 @@ echo "Create $FORGE_HOME if necessary"
 ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
 
 echo "Sync code on root@$HOST:$FORGE_HOME"
-rsync -a --delete src/ root@$HOST:$FORGE_HOME/src/
+rsync -a --delete src/ root@$HOST:$FORGE_HOME/
 
 echo "Run Install on $HOST"
-ssh root@$HOST "$FORGE_HOME/src/install-ng --auto --reinit"
+ssh root@$HOST "$FORGE_HOME/install-ng --auto --reinit"
 
 echo "Dump freshly installed database"
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
diff --git a/tests/scripts/fusionforge-build-and-test-src-cos6.sh b/tests/scripts/fusionforge-build-and-test-src-cos6.sh
index 6361e4c..3b84818 100755
--- a/tests/scripts/fusionforge-build-and-test-src-cos6.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-cos6.sh
@@ -25,10 +25,10 @@ echo "Create $FORGE_HOME if necessary"
 ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
 
 echo "Sync code on root@$HOST:$FORGE_HOME"
-rsync -a --delete src/ root@$HOST:$FORGE_HOME/src/
+rsync -a --delete src/ root@$HOST:$FORGE_HOME/
 
 echo "Run Install on $HOST"
-ssh root@$HOST "$FORGE_HOME/src/install-ng --auto --reinit"
+ssh root@$HOST "$FORGE_HOME/install-ng --auto --reinit"
 
 echo "Dump freshly installed database"
 ssh root@$HOST "su - postgres -c \"pg_dumpall\" > /root/dump"
diff --git a/tests/scripts/fusionforge-build-and-test-src-deb.sh b/tests/scripts/fusionforge-build-and-test-src-deb.sh
index 8a96a9b..cbe677e 100755
--- a/tests/scripts/fusionforge-build-and-test-src-deb.sh
+++ b/tests/scripts/fusionforge-build-and-test-src-deb.sh
@@ -19,11 +19,11 @@ ssh root@$HOST "apt-get update"
 
 echo "Sync code on root@$HOST:$FORGE_HOME"
 ssh root@$HOST "[ -d $FORGE_HOME ] || mkdir -p $FORGE_HOME"
-rsync -a --delete src/ root@$HOST:$FORGE_HOME/src/
+rsync -a --delete src/ root@$HOST:$FORGE_HOME/
 rsync -a --delete tests/ root@$HOST:$FORGE_HOME/tests/
 
 echo "Run Install on $HOST"
-ssh root@$HOST "$FORGE_HOME/src/install-ng --auto --reinit"
+ssh root@$HOST "$FORGE_HOME/install-ng --auto --reinit"
 
 # Dump database
 echo "Dump freshly installed database"

-----------------------------------------------------------------------

Summary of changes:
 src/etc/config.ini-opt                               |    6 +++---
 src/install/install5_post                            |    4 ++--
 src/utils/manage-apache-config.sh                    |    2 +-
 tests/scripts/fusionforge-build-and-test-src-cos.sh  |    4 ++--
 tests/scripts/fusionforge-build-and-test-src-cos6.sh |    4 ++--
 tests/scripts/fusionforge-build-and-test-src-deb.sh  |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list