From ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 8 Dec 2016 20:55:57 +0100 Subject: Fix deploy permissions --- provider/posts/blog/git-deploy.md | 1 + src/Site.hs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/provider/posts/blog/git-deploy.md b/provider/posts/blog/git-deploy.md index ddda12f..92d94fe 100644 --- a/provider/posts/blog/git-deploy.md +++ b/provider/posts/blog/git-deploy.md @@ -42,6 +42,7 @@ $touchedMaster || exit 0 git clone --branch master --depth 1 --single-branch file://$(pwd) ${tmpDir} cd ${tmpDir} + umask 0022 nix-shell --run "dirty-haskell build && dirty-haskell deploy" } 2>&1 | stdbuf -o 0 tr '\r' '\n' | logger --id=$$ -p daemon.info -t dirty-haskell ~~~ diff --git a/src/Site.hs b/src/Site.hs index 607c33c..96063dd 100644 --- a/src/Site.hs +++ b/src/Site.hs @@ -261,5 +261,5 @@ toFilePath' = (providerDirectory config ) . toFilePath config :: Configuration config = defaultConfiguration { providerDirectory = "provider" - , deployCommand = "rsync -av --progress -c --delete-delay -m _site/ /srv/www/dirty-haskell.org/" + , deployCommand = "rsync -v --progress -ac --no-P --no-g --chmod=ugo=rwX --delete-delay -m _site/ /srv/www/dirty-haskell.org/" } -- cgit v1.2.3