Commit cd6f4a10 authored by Ilya Rassadin's avatar Ilya Rassadin
Browse files

add SSH_OPTS variable

parent 2852e828

.deploy_code_to_server.yml

+4 −4
Original line number Diff line number Diff line 
.deploy_code_to_server:

  extends: .before_deploy_code

  script:

    - rsync -avz --chown=$user:$group -e "ssh -p${!PROJECT_PORT} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " $CI_PROJECT_DIR/www/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/www/

    - rsync -avz --chown=$user:$group -e "ssh $SSH_OPTS" $CI_PROJECT_DIR/www/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/www/

  only:

    refs:

    - beta
@@ -28,9 +28,9 @@ 
    - curl -O https://gitlab.cetera.ru/boilerplate/ci/raw/master/rsync-filter-std

    - *set_rsync_filter

    - echo PROJECT_FILTER set to $PROJECT_FILTER

    - rsync -avz --chown=$user:$group -e "ssh -p${!PROJECT_PORT} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " --filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" $RSYNC_PARAMS $CI_PROJECT_DIR/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/

    - rsync -avz --chown=$user:$group -e "ssh $SSH_OPTS" --filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" $RSYNC_PARAMS $CI_PROJECT_DIR/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/

    - if [ $PROJECT_CMS_TYPE = bitrix ]; then curl -o /tmp/.settings_extra.php https://gitlab.cetera.ru/boilerplate/ci/raw/master/.settings_extra.php; fi

    - if [ $PROJECT_CMS_TYPE = bitrix ]; then rsync -avz --chown=$user:$group -e "ssh -p${!PROJECT_PORT} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " /tmp/.settings_extra.php root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/www/bitrix/; fi

    - if [ $PROJECT_CMS_TYPE = bitrix ]; then rsync -avz --chown=$user:$group -e "ssh $SSH_OPTS" /tmp/.settings_extra.php root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/www/bitrix/; fi

    - curl -L ${!PROJECT_SERVER}/pagespeed_admin/cache?purge=* || echo "can't purge cache"

  only:

    refs:
@@ -41,7 +41,7 @@ 
deploy_autotests_to_server:

  extends: .before_deploy_code

  script:

    - rsync -avz --delete --chown=www-data:www-data -e "ssh -p${!PROJECT_PORT} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " $CI_PROJECT_DIR/autotests/ root@vps6.cetera.ru::www/autotest.cetera.su/projects/$CI_PROJECT_NAME/;

    - rsync -avz --delete --chown=www-data:www-data -e "ssh $SSH_OPTS" $CI_PROJECT_DIR/autotests/ root@vps6.cetera.ru::www/autotest.cetera.su/projects/$CI_PROJECT_NAME/;

  only:

    refs:

      - master

.deploy_composer_files_to_server.yml

+1 −1
Original line number Diff line number Diff line 
.upload_composer_files: &upload_composer_files |

  if [ -d "$CI_PROJECT_DIR/vendor" ];

  then

    rsync -L -avz --delete --chown=$user:$group -e "ssh -p${!PROJECT_PORT} -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " $CI_PROJECT_DIR/vendor/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/$COMPOSER_SERVER_DIR;

    rsync -L -avz --delete --chown=$user:$group -e "ssh $SSH_OPTS" $CI_PROJECT_DIR/vendor/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/$COMPOSER_SERVER_DIR;

  fi



.deploy_composer_files_to_server:

before_script.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ variables: 
  user: www-data

  group: www-data





#

# Проверка исходного php-кода на соответствие стандартам оформления

# Положено тут, потому что непонятно пока куда еще это приткнуть, чтобы выполнялось всегда и у всех
@@ -76,4 +75,5 @@ phpcs_test: 
  - export PROJECT_PORT=${PROJECT_PORT:-22}

  - echo "$PRODUCTION_DEPLOY_KEY" > ~/.ssh/deploy.key

  - chmod 0400 ~/.ssh/deploy.key

  - export SSH_OPTS="-o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key -p${!PROJECT_PORT}"

  script: []