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

remove numeric ids

parent a92d45f2

.deploy_code_to_server.yml

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

  extends: .before_deploy_code

  script:

    - rsync -avz --chown=$user:$group --numeric-ids -e "ssh -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 -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " $CI_PROJECT_DIR/www/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/www/

  only:

    refs:

    - beta
@@ -27,7 +27,7 @@ 
    - 'which curl || (apt-get update -y && apt-get install curl -y)'

    - curl -O https://gitlab.cetera.ru/boilerplate/ci/raw/master/rsync-filter-std

    - *set_rsync_filter

    - rsync -avz --chown=$user:$group --numeric-ids -e "ssh -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 -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}/

  only:

    refs:

    - beta

.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 -avz --delete --chowb=$user:$group --numeric-ids -e "ssh -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 -avz --delete --chowb=$user:$group -e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key " $CI_PROJECT_DIR/vendor/ root@${!PROJECT_SERVER}::www/${!PROJECT_SITE}/$COMPOSER_SERVER_DIR;

  fi



.deploy_composer_files_to_server: