X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=84be628da68a7b4e4d6dd29d5318233a0e461612;hb=refs%2Fheads%2Fpython3;hp=429cdca632c975d4ddbbec40cb31ea8d5405ff59;hpb=d25a3757799c787ee44bb5a6539e3a0edf05fd80;p=plcapi.git diff --git a/Makefile b/Makefile index 429cdca..84be628 100644 --- a/Makefile +++ b/Makefile @@ -73,9 +73,9 @@ endif endif LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude Accessors_site.py -RSYNC_EXCLUDES := --exclude .svn --exclude .git --exclude '*~' --exclude TAGS $(LOCAL_RSYNC_EXCLUDES) +RSYNC_EXCLUDES := --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) +RSYNC := rsync -ai $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) sync: ifeq (,$(SSHURL)) @@ -88,8 +88,7 @@ else +$(RSYNC) db-config.d/ $(SSHURL)/etc/planetlab/db-config.d/ +$(RSYNC) plc.d/ $(SSHURL)/etc/plc.d/ +$(RSYNC) apache/plc.wsgi $(SSHURL)/usr/share/plc_api/apache/ - $(SSHCOMMAND) /etc/plc.d/httpd stop - $(SSHCOMMAND) /etc/plc.d/httpd start + $(SSHCOMMAND) systemctl restart plc endif #################### convenience, for debugging only