commit 2e0bb5a701cf363a40f0da1bb34ca42bfde81b00
author Scott Baker <smbaker@gmail.com> Fri Sep 12 15:55:39 2014 -0700
committer Scott Baker <smbaker@gmail.com> Fri Sep 12 15:55:39 2014 -0700
tree 7e76c96e4881bbe9c68d7c1180f69572c95393eb
parent 4c9bde0b4a036b87c763a83e222b28c30847b7f5
parent c44f26c232d7007a1fd1e4c807673c070c5c2710

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

opencloud.spec

diff --git a/opencloud.spec b/opencloud.spec
index 6f282e1..4d72a55 100644
--- a/opencloud.spec
+++ b/opencloud.spec
@@ -1,7 +1,7 @@
 Summary: OpenCloud core services
 Name: opencloud
 Version: 1.0.25
-Release: 7
+Release: 8
 License: GPL+
 Group: Development/Tools
 Source0: %{_tmppath}/%{name}-%{version}.tar.gz
@@ -110,17 +110,19 @@
 ln -s ec2_observer /opt/planetstack/observer
 ln -s config-opencloud.py /opt/planetstack/syndicate_observer/syndicatelib_config/config.py
 
+if [ ! -e /opt/planetstack/public_keys ]; then
+    cd /opt/planetstack
+    scripts/opencloud genkeys
+fi
+
 if [ "$1" == 1 ] ; then
     echo "NEW INSTALL - initializing database"
     /opt/planetstack/scripts/opencloud initdb
 else
     echo "UPGRADE - doing evolution"
     /opt/planetstack/scripts/opencloud evolvedb
-fi
-
-if [ ! -f /opt/planetstack/public_keys ]; then
-    cd /opt/planetstack
-    scripts/opencloud genkeys
+    #echo "UPGRADE - doing migration"    
+    #/opt/planetstack/scripts/opencloud migratedb
 fi
 
 # start the server