Merge pull request #268 from autocrypt/new-server

New server

.credentials/autocrypt.org.hostkeys

@@ -1,3 +1,6 @@
 autocrypt.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9IAHIdl/I5tsLnX9dtOxEx28SlJDcSPTVSkh+eEaoOxB+YoK25Zqo62vWdvsKT4ny6chPd41J78jhG27NA5V/abOvDBRArP5EiX3nTbKjqG7d3SRLJjZKo6PLFkFWUNzJ0qgY41OQ1BPfYhZx4+TFXHmKddwHkbvXloY+MZYjcFTXiZBRxxarXci0ihMyMR3KJ2I3Sl/R98UGu6mrm0WtodpU4yR6LRWJXzXyuHs43coRuNKsIHf+u1W7D6C6sAvmBXbi4hfwMnU5EAXOmSGoBou1q1t3ulwtYsCEB7Xgrx9gI4bmiyAW23CIyVzcJgW8TABTyaH2O3+4VKm/tbMP
 autocrypt.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHljUFsMOQ2fNKSgztqmoWCeDzAXyKoq+ALDczr8GWE0
 autocrypt.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHSMVMA3ypl/YUEdxNdYM/D4nP/DpBziRcmVpHHfbUWeeF/8niTFftGZAZPsngVKPzpRPPT27hw6c5fDNR37UxE=
+78.47.150.134 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDr2xvZiJiG9G+dD+AOM01Aa8QeCVb/5setICMVtSHwBBkj6MRiROlIDzAkCExvHpKCDcE6ZiLLppBokm64oTEO0dzO2Gc33dFM6OoO9kTXBM+9JG+HsovBHPSIAkui5mZzgudNovW2KCFQ0zGEJ9P88xgSIXWNfzorXj3OnfLSFAeAC/87kAEPxaGzIeB2aSkH9zcGDTsDJlJr/moM2b13rmthbdcwy3twICPhhiAX6qeRTmIC8XT8wZt7tVZcOEDKGfrBcurXvEPoZBM3uSdhtB6QSKQLTzFt/ouN4A9rfDVrwN8wzUKG4d5BJtpoQha4hCUoipWJk/As92aYF8bV
+78.47.150.134 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHhmLD80LczB3IWwQlMGjz4fqECx/7dMxBK7riUJpUvS
+78.47.150.134 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKgaExCiUupV3vI/RkDHSdy1sSu6capBCUf+kGR4Oa79KntvLEAijJ5KobvWrvnvaaZs2HpXOgkKWjDDdhaLck8=

.scripts/deploy.sh

@@ -1,15 +1,24 @@
 #!/bin/bash
-
+set -e
+set -u
+set -x
 # To debug your ssh connection enable this...
 # scp -r -v \
 #   -o StrictHostKeyChecking=no \
 #   -o PasswordAuthentication=no \
 #   -o IdentitiesOnly=yes \
 #   -i $TRAVIS_BUILD_DIR/id_rsa \
-#   $TRAVIS_BUILD_DIR/doc/_build ${DEPLOY_USER}@autocrypt.org:~/test
+#   $TRAVIS_BUILD_DIR/doc/_build ${DEPLOY_USER}@${DEPLOY_SERVER}:~/test
+
+mkdir -p -m 0700 ~/.ssh
+openssl aes-256-cbc -K $encrypted_ee89c1e228aa_key -iv $encrypted_ee89c1e228aa_iv -in .credentials/autocrypt.id_rsa.enc -out ~/.ssh/id_rsa -d
+chmod 600 ~/.ssh/id_rsa
+cat .credentials/autocrypt.org.hostkeys >> ~/.ssh/known_hosts
+printf "Host *\n" >> ~/.ssh/config
+printf " %sAuthentication no\n" ChallengeResponse Password KbdInteractive >> ~/.ssh/config
 
 rsync -avz $TRAVIS_BUILD_DIR/doc/_build/html/ \
-  ${DEPLOY_USER}@autocrypt.org:build/${TRAVIS_BRANCH/\//_}
+  ${DEPLOY_USER}@${DEPLOY_SERVER}:build/${TRAVIS_BRANCH/\//_}
 
 rsync -avz $TRAVIS_BUILD_DIR/doc/_build/latex/autocrypt*.pdf \
-  ${DEPLOY_USER}@autocrypt.org:build/${TRAVIS_BRANCH/\//_}
+  ${DEPLOY_USER}@${DEPLOY_SERVER}:build/${TRAVIS_BRANCH/\//_}

.travis.yml

@@ -6,6 +6,7 @@ python:
 
 env:
   - DEPLOY_USER=autocrypt DEPLOY_SERVER="autocrypt.org"
+  - DEPLOY_USER=autocrypt DEPLOY_SERVER="78.47.150.134"
 
 addons:
   apt:
@@ -16,13 +17,6 @@ addons:
     - latexmk
     - inkscape
 
-before_install:
-  - mkdir -p -m 0700 ~/.ssh
-  - openssl aes-256-cbc -K $encrypted_ee89c1e228aa_key -iv $encrypted_ee89c1e228aa_iv -in .credentials/autocrypt.id_rsa.enc -out ~/.ssh/id_rsa -d
-  - chmod 600 ~/.ssh/id_rsa
-  - cat .credentials/autocrypt.org.hostkeys >> ~/.ssh/known_hosts
-  - printf "Host *\n" >> ~/.ssh/config
-  - printf " %sAuthentication no\n" ChallengeResponse Password KbdInteractive >> ~/.ssh/config
 install:
   - pip install sphinx