commit 3704434cda4826b5c032264603dad51e0d3dc25d
author Andy Bavier <acb@cs.princeton.edu> Fri Feb 06 16:39:06 2015 -0500
committer Andy Bavier <acb@cs.princeton.edu> Fri Feb 06 16:39:06 2015 -0500
tree 161e6c482a56afff5def81583487bb4d737f5efe
parent 85b98e77deefb4c552e740ea7a0cda8cf48b83ba

Docker support

planetstack/scripts/opencloud

diff --git a/planetstack/scripts/opencloud b/planetstack/scripts/opencloud
index e00be26..9950d1b 100755
--- a/planetstack/scripts/opencloud
+++ b/planetstack/scripts/opencloud
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -z "$1" ]; then
     echo usage: $0 "[initdb | createdb | dropdb | syncdb | runserver | resetdb | dumpdata]"
@@ -24,9 +24,8 @@
         return
     fi
 
-    /sbin/service postgresql initdb
-    /sbin/service postgresql start
-    /sbin/chkconfig postgresql on
+    service postgresql initdb
+    service postgresql start
 
     netstat -nl | grep -i ":5432 "
     if [[ $? != 0 ]]; then
@@ -66,6 +65,7 @@
     pkill -f "python.*runserver"
 }
 function runserver {
+    ensure_postgres_running
     PUBLIC_HOSTNAME=`$XOS_DIR/xos-config.py get server_hostname $HOSTNAME`
     echo "Starting XOS Service on $PUBLIC_HOSTNAME:8000"
     python manage.py runserver  $PUBLIC_HOSTNAME:8000&