X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=opencloud.spec;h=583100698361bbfce219f6716bdde118bc8455a7;hb=4d09aac2be22581285e1ef2e092c431fbdbd01fe;hp=6f282e16debc6c0d3a0c164ef5f4c8f960f75ca1;hpb=33d69c66f28957ef391d33ca99791da9bc18987f;p=plstackapi.git

diff --git a/opencloud.spec b/opencloud.spec
index 6f282e1..5831006 100644
--- a/opencloud.spec
+++ b/opencloud.spec
@@ -1,6 +1,6 @@
 Summary: OpenCloud core services
 Name: opencloud
-Version: 1.0.25
+Version: 1.0.26
 Release: 7
 License: GPL+
 Group: Development/Tools
@@ -29,7 +29,7 @@ requires: GeoIP
 # Empty section.
 
 %pre
-#pip-python install django==1.5
+pip-python install django==1.7
 pip-python install djangorestframework
 pip-python install markdown  # Markdown support for the browseable API.
 pip-python install pyyaml    # YAML content-type support.
@@ -110,19 +110,20 @@ rm -rf %{buildroot}
 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"
+    # scripts/opencloud will choose evolve or migrate depending on django version
+    echo "UPGRADE - doing evolution/migration"
     /opt/planetstack/scripts/opencloud evolvedb
 fi
 
-if [ ! -f /opt/planetstack/public_keys ]; then
-    cd /opt/planetstack
-    scripts/opencloud genkeys
-fi
-
 # start the server
 /opt/planetstack/scripts/opencloud runserver