X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=blobdiff_plain;f=Makefile;h=3f61822cf6c9174099150cff0861499052014b18;hp=ec98dd60b5d29d2ee938df1b8e3bf63a7e72f643;hb=9aecb8c6fde06136bef94e2fd6fce832dc3c0c10;hpb=fd0079adaeefff539696056612d67c97b707f7bb

diff --git a/Makefile b/Makefile
index ec98dd6..3f61822 100644
--- a/Makefile
+++ b/Makefile
@@ -57,26 +57,18 @@ tags:
 # 2 forms are supported
 # (*) if your plc root context has direct ssh access:
 # make sync PLC=private.one-lab.org
-# (*) otherwise, under a vs-capable box, using /vservers/<> and vserver exec
-# make sync PLCHOST=vs64-1.pl.sophia.inria.fr GUEST=2012.04.02--f14-32-1-vplc26
-# (*) with an lxc-capable box, using /var/lib/lxc/<>/rootfs and ssh 
-# make sync PLCHOSTLXC=lxc64-1.pls.sophia.inria.fr GUEST=2012.04.02--lxc16-1-vplc25
+# (*) 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 PLCHOSTLXC
-VPLCNAME=$(lastword $(subst -, ,$(GUEST)))
-SSHURL:=root@$(PLCHOST):/var/lib/lxc/$(GUEST)/rootfs
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(VPLCNAME)
-else
-ifdef GUEST
-SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST) exec
-endif
-endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
+else
+ifdef PLCHOSTLXC
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
+endif
 endif
 
 LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude Accessors_site.py
@@ -86,15 +78,16 @@ RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
 sync:
 ifeq (,$(SSHURL))
-	@echo "sync: You must define, either PLC, or PLCHOST & GUEST, on the command line"
-	@echo "  e.g. make sync PLC=boot.planetlab.eu"
-	@echo "  or   make sync PLCHOST=testplc.onelab.eu GUEST=vplc03.inria.fr"
+	@echo "sync: I need more info from the command line, e.g."
+	@echo "  make sync PLC=boot.planetlab.eu"
+	@echo "  make sync PLCHOSTLXC=.. GUESTNAME=.."
 	@exit 1
 else
 	+$(RSYNC) plcsh PLC planetlab5.sql migrations aspects $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
-	$(SSHCOMMAND) apachectl graceful
+	$(SSHCOMMAND) /etc/plc.d/httpd stop
+	$(SSHCOMMAND) /etc/plc.d/httpd start
 endif
 
 #################### convenience, for debugging only