Commit 367f2693 authored by Ilya Rassadin's avatar Ilya Rassadin
Browse files

owner and group are no more hardcoded into jobs

parent a8440155

.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=33:33 --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 --owner=$user --group=$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/

  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=33:33 --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 --owner=$user --group=$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}/

  only:

    refs:

    - beta

.deploy_composer_files_to_server.yml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  script:

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

      then

        rsync -avz --delete --chown=33:33 --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}/vendor/;

        rsync -avz --delete --owner=$user --group=$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}/vendor/;

      fi

  only:

    refs:

before_script.yml

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ before_script: 
  - 'which rsync || ( apt-get update -y && apt-get install rsync -y )'

  - 'which perl || (apt-get update -y && apt-get install perl -y)'



variables:

  user: www-data

  group: www-data



.set_layouts: &set_layouts |

  cd $CI_PROJECT_DIR/working/ && export LAYOUTS=(`ls -1 -d ./*/|perl -nE 's{^\./(.+)/$}{$1}; print if /^[^.]/'`)