Skip to content
Snippets Groups Projects
Commit 0c50988c authored by Bartek Jaskulski's avatar Bartek Jaskulski
Browse files

Merge branch 'fix/demo-key-overwrite' into 'master'

fix: use local variable for overwriting ssh keys

See merge request wpdesk/gitlab-ci!269
parents 877e87bd bb239238
No related branches found
No related tags found
No related merge requests found
deploy:demo: deploy:demo:
image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/amazon-svn-deploy:24.09 image: gitlab.wpdesk.dev:5050/wpdesk/docker-tests/amazon-svn-deploy:24.09
variables:
SSH_KEY: $GLOBAL_SSH_KEY
environment: environment:
name: $DEPLOY_SERVER name: $DEPLOY_SERVER
url: https://$DEPLOY_SERVER url: https://$DEPLOY_SERVER
...@@ -43,13 +45,13 @@ deploy:demo: ...@@ -43,13 +45,13 @@ deploy:demo:
variables: variables:
SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/demo.octolize.com/public_html/wp-content/plugins SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/demo.octolize.com/public_html/wp-content/plugins
SSH_PORT: 222 SSH_PORT: 222
GLOBAL_SSH_PRIV_KEY: $DEMO_FS_SSH_KEY_FILE SSH_KEY: $DEMO_FS_SSH_KEY_FILE
## stage.demo.octolize.com ## stage.demo.octolize.com
- if: $DEPLOY_SERVER == 'stage.demo.octolize.com' - if: $DEPLOY_SERVER == 'stage.demo.octolize.com'
variables: variables:
SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/stage.demo.octolize.com/public_html/wp-content/plugins SSH_DSN: wlgmnfabmq@s125.cyber-folks.pl:/home/wlgmnfabmq/domains/stage.demo.octolize.com/public_html/wp-content/plugins
SSH_PORT: 222 SSH_PORT: 222
GLOBAL_SSH_PRIV_KEY: $DEMO_FS_SSH_KEY_FILE SSH_KEY: $DEMO_FS_SSH_KEY_FILE
## demo.flexibleinvoices.com ## demo.flexibleinvoices.com
- if: $DEPLOY_SERVER == 'demo.flexibleinvoices.com' - if: $DEPLOY_SERVER == 'demo.flexibleinvoices.com'
variables: variables:
...@@ -57,8 +59,8 @@ deploy:demo: ...@@ -57,8 +59,8 @@ deploy:demo:
SSH_PORT: 40022 SSH_PORT: 40022
before_script: before_script:
- eval "$(ssh-agent -s)" - eval "$(ssh-agent -s)"
- chmod 600 "$GLOBAL_SSH_PRIV_KEY" - chmod 600 "$SSH_KEY"
- ssh-add "$GLOBAL_SSH_PRIV_KEY" - ssh-add "$SSH_KEY"
- echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts - echo "$SSH_KNOWN_HOSTS" | tr -d '\r' > ~/.ssh/known_hosts
script: script:
- rsync -rlDe "ssh -p $SSH_PORT" --delete "$CI_PROJECT_DIR/release/$CI_PROJECT_NAME" $SSH_DSN - rsync -rlDe "ssh -p $SSH_PORT" --delete "$CI_PROJECT_DIR/release/$CI_PROJECT_NAME" $SSH_DSN
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment