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:
e065a4f
)
only download GeoLiteCity if it does not exist; require UPLOAD_HOST on make command...
author
Scott Baker
<smbaker@gmail.com>
Fri, 18 Apr 2014 23:14:04 +0000
(16:14 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Fri, 18 Apr 2014 23:14:04 +0000
(16:14 -0700)
Makefile
patch
|
blob
|
history
opencloud.spec
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
802fa0b
..
7f36f03
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-4,7
+4,6
@@
VERSION = $(shell rpm -q --specfile $(SPECFILE) --qf '%{VERSION}\n' | head -n 1)
RELEASE = $(shell rpm -q --specfile $(SPECFILE) --qf '%{RELEASE}\n' | head -n 1)
UPLOAD_SLICE=princeton_planetstack
RELEASE = $(shell rpm -q --specfile $(SPECFILE) --qf '%{RELEASE}\n' | head -n 1)
UPLOAD_SLICE=princeton_planetstack
-UPLOAD_HOST=node36.princeton.vicci.org
PWD = $(shell pwd)
PWD = $(shell pwd)
@@
-36,6
+35,9
@@
clean:
rm -rf build
install: $(NAME)-$(VERSION)-$(RELEASE).rpm
rm -rf build
install: $(NAME)-$(VERSION)-$(RELEASE).rpm
+ifndef UPLOAD_HOST
+ $(error please specify UPLOAD_HOST=<hostname> on make command line)
+endif
scp $(NAME)-$(VERSION)-$(RELEASE).x86_64.rpm $(UPLOAD_SLICE)@$(UPLOAD_HOST):/root/
ssh $(UPLOAD_SLICE)@$(UPLOAD_HOST) yum -y install gcc graphviz-devel graphviz-python postgresql postgresql-server python-pip python-psycopg2 libxslt-devel python-httplib2 GeoIP
ssh $(UPLOAD_SLICE)@$(UPLOAD_HOST) rpm --install --upgrade --replacepkgs /root/$(NAME)-$(VERSION)-$(RELEASE).x86_64.rpm
scp $(NAME)-$(VERSION)-$(RELEASE).x86_64.rpm $(UPLOAD_SLICE)@$(UPLOAD_HOST):/root/
ssh $(UPLOAD_SLICE)@$(UPLOAD_HOST) yum -y install gcc graphviz-devel graphviz-python postgresql postgresql-server python-pip python-psycopg2 libxslt-devel python-httplib2 GeoIP
ssh $(UPLOAD_SLICE)@$(UPLOAD_HOST) rpm --install --upgrade --replacepkgs /root/$(NAME)-$(VERSION)-$(RELEASE).x86_64.rpm
diff --git
a/opencloud.spec
b/opencloud.spec
index
3420bdf
..
2828bdb
100644
(file)
--- a/
opencloud.spec
+++ b/
opencloud.spec
@@
-1,6
+1,6
@@
Summary: OpenCloud core services
Name: opencloud
Summary: OpenCloud core services
Name: opencloud
-Version: 1.0.
7
+Version: 1.0.
8
Release: 1
License: GPL+
Group: Development/Tools
Release: 1
License: GPL+
Group: Development/Tools
@@
-53,9
+53,11
@@
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
wget -P /usr/lib/python2.7/site-packages/suit/static/suit/js http://code.jquery.com/jquery-1.9.1.min.js
-rm -f /usr/share/GeoIP/GeoLiteCity*
-wget -P /usr/share/GeoIP http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
-gzip -d /usr/share/GeoIP/GeoLiteCity*.gz
+if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then
+ rm -f /usr/share/GeoIP/GeoLiteCity.*
+ wget -P /usr/share/GeoIP http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+ gzip -d /usr/share/GeoIP/GeoLiteCity*.gz
+fi
%install
rm -rf %{buildroot}
%install
rm -rf %{buildroot}