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

diff --git a/Makefile b/Makefile
index ed90a7c..3f61822 100644
--- a/Makefile
+++ b/Makefile
@@ -61,20 +61,13 @@ tags:
 # $ run export
 # and cut'n paste the export lines before you run make sync
 
-PLCHOST ?= testplc.onelab.eu
-
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
-SSHURL:=root@$(PLCHOST):/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
+SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
 endif
 endif
 
@@ -87,13 +80,14 @@ sync:
 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=vs64-1.pl.sophia.inria.fr GUESTNAME=
+	@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