X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=8446d4abe0a283d24e9fbe2b0564319e5ab6a823;hb=d4fdf5099eff793459ad956b6a40ff85003cecc0;hp=0bfc75dab05b8cc1641fffb6839619e9e7bba7dc;hpb=78467ecd9b02ec60d9572178995ed347fc917f59;p=sfa.git

diff --git a/Makefile b/Makefile
index 0bfc75da..8446d4ab 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ python-install:
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
-	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan)
+	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan; ln -s sfaadmin.py sfaadmin)
 
 python-clean: version-clean
 	python setup.py clean
@@ -96,7 +96,7 @@ force:
 ##########
 # a lot of stuff in the working dir is just noise
 scan:
-	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg)$$' 
+	@find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' 
 tags:	
 	$(MAKE) scan | xargs etags
 
@@ -110,20 +110,32 @@ signatures:
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
 # make sync PLC=private.one-lab.org
-# (*) otherwise, entering through the root context
-# make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr
+# (*) otherwise, for test deployments, use on your testmaster
+# $ run export
+# and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
-ifdef GUEST
-ifdef PLCHOST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
-endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME)
+else
+ifdef PLCHOSTVS
+SSHURL:=root@$(PLCHOSTVS):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTVS) vserver $(GUESTNAME) exec
+endif
+endif
+endif
+
+synccheck: 
+ifeq (,$(SSHURL))
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTVS=.. GUESTNAME=.."
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.. GUESTHOSTNAME=.."
+	@exit 1
 endif
 
 LOCAL_RSYNC_EXCLUDES	+= --exclude '*.pyc' 
@@ -136,18 +148,9 @@ CLIENTS = $(shell ls sfa/clientbin/*.py)
 
 BINS =	./config/sfa-config-tty ./config/gen-sfa-cm-config.py \
 	./sfa/server/sfa-start.py \
-	./sfa/importer/sfa-import.py ./sfa/importer/sfa-nuke.py \
+	./sfa/clientbin/sfaadmin.py \
 	$(CLIENTS)
 
-synccheck: 
-ifeq (,$(SSHURL))
-	@echo "*sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
-	@echo "  e.g. make sync PLC=private.one-lab.org"
-	@echo "  or   make sync PLCHOST=testbox1.inria.fr GUEST=vplc03.inria.fr"
-	@exit 1
-endif
-
-
 synclib: synccheck
 	+$(RSYNC) --relative ./sfa/ --exclude migrations $(SSHURL)/usr/lib\*/python2.\*/site-packages/
 syncbin: synccheck
@@ -159,7 +162,7 @@ syncconfig:
 synctest: synccheck
 	+$(RSYNC) ./tests/ $(SSHURL)/root/tests-sfa
 syncrestart: synccheck
-	$(SSHCOMMAND) exec service sfa restart
+	$(SSHCOMMAND) service sfa restart
 
 syncmig:
 	+$(RSYNC) ./sfa/storage/migrations $(SSHURL)/usr/share/sfa/
@@ -172,12 +175,6 @@ syncfast: synclib syncrestart
 
 .PHONY: synccheck synclib syncbin syncconfig synctest syncrestart sync syncfast
 
-syncrica: synccheck
-	+$(RSYNC) --relative ./sfa/federica ./sfa/generic/fd.py ./sfa/rspecs/versions/federica.py $(SSHURL)/usr/lib\*/python2.\*/site-packages/
-	$(SSHCOMMAND) exec service sfa restart
-
-.PHONY: syncrica
-
 ##########
 CLIENTLIBFILES= \
 sfa/examples/miniclient.py \