Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
VILLASframework
Website
Commits
e8e18ec3
Commit
e8e18ec3
authored
May 22, 2017
by
Steffen Vogel
🎅🏼
Browse files
fix little error in deployment
parent
d2d4ed23
Pipeline
#14998
passed with stages
in 24 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
e8e18ec3
...
...
@@ -9,7 +9,7 @@ DEPLOY_PATH ?= /var/www/villas/website/
SRCDIR
:=
$(
realpath
$(
dir
$(
lastword
$(MAKEFILE_LIST)
)))
BUILDDIR
?=
$(SRCDIR)
/build
RSYNC_OPTS
?=
--archive
--delete
--verbose
--progress
--ignore-missing-args
--copy-links
--chown
$(DEPLOY_USER)
:
$(DEPLOY_USER)
RSYNC_OPTS
?=
--archive
--delete
--verbose
--ignore-missing-args
--copy-links
--chown
$(DEPLOY_USER)
:
$(DEPLOY_USER)
DAVIX_OPTS
?=
-r10
--userlogin
$(DEPLOY_USER)
--userpass
$(DEPLOY_PASS)
JEKYLL_OPTS
?=
-s
$(SRCDIR)
-d
$(BUILDDIR)
...
...
@@ -19,7 +19,7 @@ build:
deploy
:
deploy-rsync
deploy-rsync
:
rsync
$(RSYNC_OPTS)
$(BUILDDIR)
$(DEPLOY_USER)
@
$(DEPLOY_HOST)
:
$(DEPLOY_PATH)
rsync
$(RSYNC_OPTS)
$(BUILDDIR)
/
$(DEPLOY_USER)
@
$(DEPLOY_HOST)
:
$(DEPLOY_PATH)
deploy-webdav
:
# Davix returns 255 for some reason...
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment