merge from Yavsc

This commit is contained in:
Paul Schneider 2015-10-10 13:58:13 +02:00
commit 53325b7e6c
30 changed files with 243 additions and 546 deletions

View file

@ -1,7 +1,7 @@
VERSION=1.1
CONFIG=Debug
LDYDESTDIR=build/web/$(CONFIG)
LDYDESTDIR=dist/web/$(CONFIG)
COPYUNCHANGED="false"
RSYNCCMD=rsync -ravu --chown=www-data:www-data
HOST_rsync_dev=totemdev.localdomain
@ -28,7 +28,7 @@ rsync_% : DESTDIR = $(DESTDIR_$@)
rsync_% : deploy
echo "!Deploying to $(HOST)!"
$(RSYNCCMD) build/web/$(CONFIG)/ root@$(HOST):$(DESTDIR)
$(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR)
ssh root@$(HOST) "service apache2 reload"
build: