From: Svante Bengtson <redacted>
Date: Tue, 23 Feb 2016 21:22:46 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/freenode/web-7.0.git
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/660a5a53914a48e83030160ab84e6250f7ad6d18?hp=40f9bf597ae1f229d3935076ac41bd7f6cc82121

Merge branch 'master' of https://github.com/freenode/web-7.0.git
---

diff --git a/.travis.yml b/.travis.yml
index 5ac99321a..156730100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,5 +5,5 @@ install: pip install -e git+https://github.com/edk0/cms7.git#egg=cms7
 script: cms7
 before_install:
 - openssl aes-256-cbc -K $encrypted_ac880c30010f_key -iv $encrypted_ac880c30010f_iv
-  -in .deploy-key.enc -out .deploy-key -d
+  -in .deploy-key.enc -out .deploy-key -d && chmod go-rwx .deploy-key
 after_success: ./deploy.sh
diff --git a/deploy.sh b/deploy.sh
index 67c677072..77724e286 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -3,12 +3,15 @@
 if [ -z "$TRAVIS_BRANCH" ]; then exit; fi
 if [ ! "$TRAVIS_BRANCH" = master ]; then exit; fi
 
-export GIT_SSH_COMMAND="ssh -i $(readlink -f .deploy-key)"
-git clone -b gh-pages git@github.com:freenode/web-7.0.git .deploy
-cd .deploy
+export SSH_KEYFILE="$(readlink -f .deploy-key)"
+export GIT_SSH="$(readlink -f ssh.sh)"
+git clone -b gh-pages git@github.com:freenode/web-7.0.git .deploy || exit 1
+cd .deploy || exit 1
+git config user.name travis
+git config user.email travis@nowhere
 rm -rf *
 cp -r ../out/* .
 cp -r ../static .
 git add -A
 git commit -m "travis: $TRAVIS_COMMIT"
-git push
+git push || exit 1
diff --git a/ssh.sh b/ssh.sh
new file mode 100755
index 000000000..6f3703f12
--- /dev/null
+++ b/ssh.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+ssh -i "$SSH_KEYFILE" "$@"