[Et-mgmt-commits-list] [SCM] virt-factory branch, master now at 0ecf120107af3bac94fc1a37d9cc3d8df4c4028d

[Adrian Likins]

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  0ecf120107af3bac94fc1a37d9cc3d8df4c4028d (commit)
       via  b409dcecc2cbb942895504b3a1844d80847501ca (commit)
       via  58470dd9fc64a2d8ea8f9cab54a656c664baf1e1 (commit)
      from  6384d5a2e512c4a72a432f7de2b6059539ec1827 (commit)

- Log -----------------------------------------------------------------
commit 0ecf120107af3bac94fc1a37d9cc3d8df4c4028d
Merge: b409dce... 6384d5a...
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Tue Jun 19 12:05:46 2007 -0400

    Merge branch 'master' of git+ssh://g-alikins@et.redhat.com/git/virt-factory

commit b409dcecc2cbb942895504b3a1844d80847501ca
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Tue Jun 19 12:05:38 2007 -0400

    run initdb on f7

commit 58470dd9fc64a2d8ea8f9cab54a656c664baf1e1
Author: Adrian Likins <alikins at grimlock.devel.redhat.com>
Date:   Tue Jun 19 11:58:42 2007 -0400

    try to handle "restart" a bit better
-----------------------------------------------------------------------

Diffstat:
 build/test-it-all.sh      |    6 ++++++
 wui/conf/virt-factory-wui |   10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/build/test-it-all.sh b/build/test-it-all.sh
index 493d70d..86873fd 100755
--- a/build/test-it-all.sh
+++ b/build/test-it-all.sh
@@ -250,6 +250,12 @@ start_services()
     /etc/init.d/cobblerd start
     /etc/init.d/puppetmaster restart
     
+
+    # for someone reason f7 doesn't the initdb on startup
+    if [ "$FEDORA_RELEASE" == "7" ] ; then
+	/etc/init.d/postgresql initdb
+    fi
+
     # this will restart postgresql
     # and also set up it's pg_hba.conf
     vf_fix_db_auth
diff --git a/wui/conf/virt-factory-wui b/wui/conf/virt-factory-wui
index 8908c16..72f63cc 100644
--- a/wui/conf/virt-factory-wui
+++ b/wui/conf/virt-factory-wui
@@ -29,8 +29,14 @@ case "$1" in
       RETVAL=$?
   ;;
     restart)
-      mongrel_rails restart -c $VIRTFACTORY_DIR -P $MONGREL_PID
-      RETVAL=$?
+      if [ -f $MONGREL_PID ] ; then
+	  mongrel_rails restart -c $VIRTFACTORY_DIR -P $MONGREL_PID
+	  RETVAL=$?
+      else
+	  pkill mongrel_rails
+	  mongrel_rails start -c $VIRTFACTORY_DIR -l $MONGREL_LOG -P $MONGREL_PID -a $ADDR -e $RAILS_ENVIRONMENT --user $USER --group $GROUP -d
+	  RETVAL=$?
+      fi
   ;;
     *)
       echo "Usage: virt-factory-wui {start|stop|restart}"

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  6384d5a2e512c4a72a432f7de2b6059539ec1827 \
  0ecf120107af3bac94fc1a37d9cc3d8df4c4028d