Merge branch 'master' into development

gitlab-ci/deploy.yml

@@ -9,14 +9,15 @@ deploy:
   before_script:
     - pip install ansible --quiet
     - git clone https://git.fudiggity.nl/ansible/newsreader.git deployment --branch master
-    - ansible-galaxy install -r deployment/roles/requirements.yml
+    - cd deployment
+    - ansible-galaxy install -r roles/requirements.yml
     - mkdir /root/.ssh && echo "$DEPLOY_HOST_KEY" > /root/.ssh/known_hosts
-    - echo "$DEPLOY_KEY" > deployment/deploy_key && chmod 0600 deployment/deploy_key
-    - echo "$VAULT_PASSWORD" > deployment/vault
+    - echo "$DEPLOY_KEY" > deploy_key && chmod 0600 deploy_key
+    - echo "$VAULT_PASSWORD" > vault
   script:
     - cd deployment
     - >
-      ansible-playbook deployment/playbook.yml
-      --inventory deployment/inventory.yml
-      --private-key deployment/deploy_key
-      --vault-password-file deployment/vault
+      ansible-playbook playbook.yml
+      --inventory inventory.yml
+      --private-key deploy_key
+      --vault-password-file vault