Merge branch '67-fix-master-deploy-job' into 'dev'

Resolve "fix master deploy job"

Closes #67

See merge request !100

.gitlab-ci.yml

@@ -356,18 +356,16 @@ master-deploy:
     - chmod 644 ~/.ssh/known_hosts
     - eval $(ssh-agent -s)
     - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - ssh -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "mkdir -p /usr/local/apache2/htdocs"
-    - scp -P "${SSH_PORT}" -r public/* "${SSH_USER}"@"${HOST_NAME}":"/usr/local/apache2/htdocs"
+    - rsync -v -r -a --delete -e  "ssh -p${SSH_PORT}" build-tuhh-asteroid/* ${SSH_USER}@${HOST_NAME}:/usr/local/apache2/htdocs/.
+    - ssh -v -p "${SSH_PORT}" "${SSH_USER}"@"${HOST_NAME}" "rm -rf /usr/local/apache2/htdocs/.htaccess" #only temporary fix
   cache:
     key: "$CI_COMMIT_REF_SLUG"
   environment:
     name: $CI_COMMIT_REF_NAME
     url: https://$PROXY_HOST_NAME$BASE_DIR
   rules:
-    - if: $CI_PROJECT_URL != 'https://collaborating.tuhh.de/cfg0846/research-topics-mat-tuhh'
-      when: never
-    - if: '$CI_COMMIT_REF_NAME == "master"'
-      when: always
+   # - if: $SSH_USER #use this only for testing
+   - if: $CI_COMMIT_REF_NAME == "master" && $SSS_USER 
 
 rsync-tuhh-deploy:
   stage: deploy