isolate initscript-related stuff in initscript.py and minor cleanups

[nodemanager.git] / Makefile

diff --git a/Makefile b/Makefile
index 4b130d5..c9e0d91 100644 (file)
--- 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,7 +68,7 @@ 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