X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=86fe485a6c6c274abd7be26cb4d556cc37f1734d;hb=bf49e81efc66b5852403e535c82f3ce0f87f1608;hp=7f36f03e54ac9d8b55766664bbd4c041c14c6a2c;hpb=566c0020d9dd39285f0cd64b048082c7497fc629;p=plstackapi.git

diff --git a/Makefile b/Makefile
index 7f36f03..86fe485 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ dist rpm: $(NAME)-$(VERSION)-$(RELEASE).rpm
 
 $(NAME)-$(VERSION).tar.gz:
 	mkdir -p $(NAME)-$(VERSION)
-	rsync -av --exclude=.svn --exclude=.git --exclude=*.tar.gz --exclude=__history --exclude=$(NAME)-$(VERSION)/ ./ $(NAME)-$(VERSION)
+	rsync -av --exclude=.svn --exclude=.git --exclude=*.tar.gz --exclude=*.rpm --exclude=__history --exclude=$(NAME)-$(VERSION)/ ./ $(NAME)-$(VERSION)
 	tar -czf $@ $(NAME)-$(VERSION)
 	rm -fr $(NAME)-$(VERSION)
 
@@ -40,8 +40,14 @@ ifndef UPLOAD_HOST
 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   
+	ssh $(UPLOAD_SLICE)@$(UPLOAD_HOST) rpm --install --upgrade --replacefiles --replacepkgs /root/$(NAME)-$(VERSION)-$(RELEASE).x86_64.rpm   
 	scp /opt/planetstack/hpc_wizard/bigquery_credentials.dat /opt/planetstack/hpc_wizard/client_secrets.json $(UPLOAD_SLICE)@$(UPLOAD_HOST):/opt/planetstack/hpc_wizard/ 
 
+install-keys:
+ifndef UPLOAD_HOST
+	$(error please specify UPLOAD_HOST=<hostname> on make command line)
+endif
+	scp /opt/planetstack/hpc_wizard/bigquery_credentials.dat /opt/planetstack/hpc_wizard/client_secrets.json $(UPLOAD_SLICE)@$(UPLOAD_HOST):/opt/planetstack/hpc_wizard/
+
 .PHONY: dist