From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 24 Apr 2015 09:24:42 +0000 (+0200)
Subject: fixed make sync - use ssh and not lxc-enter-namespace
X-Git-Tag: plcapi-5.3-8~2
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=265d4d1aad48f17575d74c1271573802e0cd6429

fixed make sync - use ssh and not lxc-enter-namespace
also properly restart httpd
---

diff --git a/Makefile b/Makefile
index 885da21..3f61822 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ SSHCOMMAND:=ssh root@$(PLC)
 else
 ifdef PLCHOSTLXC
 SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)
-SSHCOMMAND:=ssh root@$(PLCHOSTLXC) virsh -c lxc:/// lxc-enter-namespace $(GUESTNAME) -- /usr/bin/env 
+SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh -o StrictHostKeyChecking=no -o LogLevel=quiet $(GUESTHOSTNAME)
 endif
 endif
 
@@ -86,7 +86,8 @@ 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