Merge branch 'master' into development

gitlab-ci/deploy.yml

@@ -10,6 +10,7 @@ deploy:
     - pip install ansible --quiet
     - git clone https://git.fudiggity.nl/sonny/ansible-playbooks.git deployment
     - mkdir /root/.ssh && echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts
+    - echo $VAULT_PASSWORD > deployment/vault
   script:
     - >
       ansible-playbook deployment/playbook.yml
@@ -17,4 +18,4 @@ deploy:
       --limit newsreader
       --user ansible
       --private-key "$DEPLOY_KEY"
-      --vault-password-file "$VAULT_FILE"
+      --vault-password-file deployment/vault