.gitlab-ci.yml

@@ -24,13 +24,7 @@ build:lektor:
  - mkdir -p ~/.ssh
  - chmod 700 ~/.ssh
  - eval $(ssh-agent -s)
- #
- # See https://gitlab.com/gitlab-org/gitlab-ce/issues/14434
- # To avoid issues with the newlines and the encoding, the variable
- # should contain the base64 encoding of the private key as follows:
- # $ cat deploy_key | base64 -w0
- #
- - ssh-add <(echo "${DEPLOY_KEY}" | base64 -d)
+ - echo "${DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null
  - ssh-keyscan -p ${DEPLOY_PORT} "${DEPLOY_HOST}" >> ~/.ssh/known_hosts
  - chmod 644 ~/.ssh/known_hosts
  only:
@@ -44,7 +38,7 @@ staging:testing:
  name: staging
  url: https://www.test.mittelab.org
  script:
- - rsync -avz -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:subdomains/test/"
+ - rsync -avz --delete -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:subdomains/test/"
 
 
 deploy:production:
@@ -54,7 +48,7 @@ deploy:production:
  name: deploy
  url: https://www.mittelab.org
  script:
- - rsync -avz -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:www/"
+ - rsync -avz --delete -e "ssh -p ${DEPLOY_PORT}" www/ "${DEPLOY_USER}@${DEPLOY_HOST}:www/"
  when: manual
  dependencies:
  - build:lektor