X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=b71d8d3b643af9522841011d7b1b590480371a65;hb=9b4d51421d84235f17185648f17a8ff377ed89c6;hp=c459e85ccee544cfcbc4bec9c5c57bba638dfdf8;hpb=a7ba28837e8c6f949f29aff64a0297ac48cbe065;p=plcapi.git

diff --git a/Makefile b/Makefile
index c459e85c..b71d8d3b 100644
--- a/Makefile
+++ b/Makefile
@@ -64,15 +64,15 @@ PLCHOST ?= testplc.onelab.eu
 
 ifdef GUEST
 SSHURL:=root@$(PLCHOST):/vservers/$(GUEST)
-SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST)
+SSHCOMMAND:=ssh root@$(PLCHOST) vserver $(GUEST) exec
 endif
 ifdef PLC
 SSHURL:=root@$(PLC):/
 SSHCOMMAND:=ssh root@$(PLC)
 endif
 
-LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' 
-RSYNC_EXCLUDES		:= --exclude .svn --exclude CVS --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
+LOCAL_RSYNC_EXCLUDES	:= --exclude '*.pyc' --exclude Accessors_site.py
+RSYNC_EXCLUDES		:= --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES)
 RSYNC_COND_DRY_RUN	:= $(if $(findstring n,$(MAKEFLAGS)),--dry-run,)
 RSYNC			:= rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES)
 
@@ -86,7 +86,7 @@ else
 	+$(RSYNC) plcsh PLC planetlab5.sql migrations $(SSHURL)/usr/share/plc_api/
 	+$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/
 	+$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/
-	$(SSHCOMMAND) exec apachectl graceful
+	$(SSHCOMMAND) apachectl graceful
 endif
 
 #################### convenience, for debugging only