X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=c9e0d916a02da461e02319791768f47aedf19661;hb=270c9eeb6f1247fa3e46d68e71a2353ce6cc1546;hp=1a555990db113fd9432c70af385277d7f28986c7;hpb=12c74117e7e48984c7fa26617c321bd445a3c4fb;p=nodemanager.git

diff --git a/Makefile b/Makefile
index 1a55599..c9e0d91 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ clean:
 
 ##########
 tags:
-	find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' | xargs etags 
+	(find . '(' -name '*.py' -o -name '*.c' -o -name '*.spec' ')' ; ls initscripts/*) | xargs etags 
 
 .PHONY: tags
 
@@ -44,7 +44,7 @@ tags:
 # specify TESTMASTER and BUILD if the key is not available yet
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+RSYNC_EXCLUDES		:= --exclude .git  --exclude .svn --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -e "ssh -i $(NODE).key.rsa" -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
@@ -60,6 +60,7 @@ ifeq (,$(NODEURL))
 else
 	+$(RSYNC) ./ $(NODEURL)/usr/share/NodeManager/
 	+$(RSYNC) ./initscripts/nm $(NODEURL)/etc/init.d/nm
+	ssh -i $(NODE).key.rsa root@$(NODE) service nm restart
 endif
 
 ### fetching the key
@@ -67,9 +68,11 @@ endif
 TESTMASTER ?= testmaster.onelab.eu
 
 ifdef BUILD
-KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key1.rsa
+KEYURL:=root@$(TESTMASTER):$(BUILD)/keys/key_admin.rsa
 endif
 
+key: $(NODE).key.rsa
+
 $(NODE).key.rsa:
 ifeq (,$(KEYURL))
 	@echo "sync: fetching $@ - You must define TESTMASTER, BUILD and NODE on the command line"
@@ -77,7 +80,8 @@ ifeq (,$(KEYURL))
 	@echo "  note that for now all test builds use the same key, so any BUILD would do"
 	@exit 1
 else
-	scp $(KEYURL) $@
+	@echo "FETCHING key"
+	+scp $(KEYURL) $@
 endif
 
 ### utility - find out the node name for a given BUILD