git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
231df4c
)
move python-czar to pip-python section, only download jquery if it does not exist...
author
Scott Baker
<smbaker@gmail.com>
Thu, 11 Sep 2014 07:25:49 +0000
(
00:25
-0700)
committer
Scott Baker
<smbaker@gmail.com>
Thu, 11 Sep 2014 07:25:49 +0000
(
00:25
-0700)
opencloud.spec
patch
|
blob
|
history
diff --git
a/opencloud.spec
b/opencloud.spec
index
066f926
..
6f282e1
100644
(file)
--- a/
opencloud.spec
+++ b/
opencloud.spec
@@
-1,7
+1,7
@@
Summary: OpenCloud core services
Name: opencloud
Version: 1.0.25
Summary: OpenCloud core services
Name: opencloud
Version: 1.0.25
-Release:
6
+Release:
7
License: GPL+
Group: Development/Tools
Source0: %{_tmppath}/%{name}-%{version}.tar.gz
License: GPL+
Group: Development/Tools
Source0: %{_tmppath}/%{name}-%{version}.tar.gz
@@
-18,7
+18,6
@@
requires: tar
requires: gcc
requires: python-httplib2
requires: GeoIP
requires: gcc
requires: python-httplib2
requires: GeoIP
-requires: python-keyczar
%description
%{summary}
%description
%{summary}
@@
-48,12
+47,15
@@
pip-python install django-evolution
pip-python install django-bitfield
pip-python install django-ipware
pip-python install django-encrypted-fields
pip-python install django-bitfield
pip-python install django-ipware
pip-python install django-encrypted-fields
+pip-python install python-keyczar
easy_install django_evolution
easy_install python_gflags
easy_install google_api_python_client
easy_install django_evolution
easy_install python_gflags
easy_install google_api_python_client
-wget -P /usr/lib/python2.7/site-packages/suit/static/suit/js http://code.jquery.com/jquery-1.9.1.min.js
+if [ ! -f /usr/lib/python2.7/site-packages/suit/static/suit/js/jquery-1.9.1.min.js ]; then
+ wget -P /usr/lib/python2.7/site-packages/suit/static/suit/js http://code.jquery.com/jquery-1.9.1.min.js
+fi
if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then
rm -f /usr/share/GeoIP/GeoLiteCity.*
if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then
rm -f /usr/share/GeoIP/GeoLiteCity.*
@@
-115,6
+117,12
@@
else
echo "UPGRADE - doing evolution"
/opt/planetstack/scripts/opencloud evolvedb
fi
echo "UPGRADE - doing evolution"
/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
# start the server
/opt/planetstack/scripts/opencloud runserver