summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-12-08 20:55:57 +0100
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-12-08 20:55:57 +0100
commitba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2 (patch)
tree6395a5a91f3623936dc50a573b27bdcc1ea276c0
parent946bc4b8690d29964a2f20484e9af7556d19e258 (diff)
downloaddirty-haskell.org-ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2.tar
dirty-haskell.org-ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2.tar.gz
dirty-haskell.org-ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2.tar.bz2
dirty-haskell.org-ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2.tar.xz
dirty-haskell.org-ba1f8b82012ea5dc307d46c4d7d5ce0bc6ba6ff2.zip
Fix deploy permissions
-rw-r--r--provider/posts/blog/git-deploy.md1
-rw-r--r--src/Site.hs2
2 files changed, 2 insertions, 1 deletions
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
42 git clone --branch master --depth 1 --single-branch file://$(pwd) ${tmpDir} 42 git clone --branch master --depth 1 --single-branch file://$(pwd) ${tmpDir}
43 43
44 cd ${tmpDir} 44 cd ${tmpDir}
45 umask 0022
45 nix-shell --run "dirty-haskell build && dirty-haskell deploy" 46 nix-shell --run "dirty-haskell build && dirty-haskell deploy"
46} 2>&1 | stdbuf -o 0 tr '\r' '\n' | logger --id=$$ -p daemon.info -t dirty-haskell 47} 2>&1 | stdbuf -o 0 tr '\r' '\n' | logger --id=$$ -p daemon.info -t dirty-haskell
47~~~ 48~~~
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
261 261
262config :: Configuration 262config :: Configuration
263config = defaultConfiguration { providerDirectory = "provider" 263config = defaultConfiguration { providerDirectory = "provider"
264 , deployCommand = "rsync -av --progress -c --delete-delay -m _site/ /srv/www/dirty-haskell.org/" 264 , deployCommand = "rsync -v --progress -ac --no-P --no-g --chmod=ugo=rwX --delete-delay -m _site/ /srv/www/dirty-haskell.org/"
265 } 265 }