From 2f41b9e4418def9b69cf237312bc592364585025 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Tue, 7 Aug 2018 16:47:47 +0200 Subject: Moved deploy.sh to bin folder --- .gitlab-ci.yml | 6 ++--- README.md | 7 +++--- bin/deploy.sh | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ deploy.sh | 72 ---------------------------------------------------------- 4 files changed, 79 insertions(+), 78 deletions(-) create mode 100755 bin/deploy.sh delete mode 100755 deploy.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8018543b..250bf0db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ test:7.1: # Install project and dependencies - &deployment_dependencies |- - chmod +x ./deploy.sh + chmod +x ./bin/deploy.sh apt update && apt install -yqq rsync openssh-client /usr/local/bin/composer --no-ansi install --no-dev /usr/local/bin/composer --no-ansi dump-autoload --optimize @@ -95,7 +95,7 @@ deploy_staging: - *deployment_ssh - *deployment_dependencies # Deploy to server - - ./deploy.sh -r "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}" + - ./bin/deploy.sh -r "${STAGING_REMOTE}" -p "${STAGING_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}" deploy_production: <<: *deploy_definition @@ -112,4 +112,4 @@ deploy_production: - *deployment_ssh - *deployment_dependencies # Deploy to server - - ./deploy.sh -r "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}" + - ./bin/deploy.sh -r "${PRODUCTION_REMOTE}" -p "${PRODUCTION_REMOTE_PATH}" -i "${CI_JOB_ID}-${CI_COMMIT_SHA}" diff --git a/README.md b/README.md index 662d994c..d56603a5 100644 --- a/README.md +++ b/README.md @@ -73,10 +73,11 @@ PRODUCTION_REMOTE # Same as STAGING_REMOTE but for the production environm PRODUCTION_REMOTE_PATH # Same as STAGING_REMOTE_PATH but for the production environment ``` -#### deploy.sh -The `deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh. +#### Scripts +##### bin/deploy.sh +The `bin/deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh. -For usage see `./deploy.sh -h` +For usage see `./bin/deploy.sh -h` ### Codestyle Please ensure that your pull requests follow [PSR-2](http://www.php-fig.org/psr/psr-2/) and [PSR-4](http://www.php-fig.org/psr/psr-4/). diff --git a/bin/deploy.sh b/bin/deploy.sh new file mode 100755 index 00000000..f1569a61 --- /dev/null +++ b/bin/deploy.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash + +set -e + +remote_host= +remote_path= +deploy_id= + +show_help(){ + echo "Usage: $0 [OPTION]..." >&2 + echo "Deploys a software with rsync over ssh" >&2 + echo "The options -i, -p and -r are required" >&2 + echo "" >&2 + echo " -h Display this help screen" >&2 + echo " -i Sets the id, a unique name for the deployment" >&2 + echo " -p Define the base path on the server" >&2 + echo " -r The remote server name and user" >&2 +} + +while getopts ":hi:p:r:" opt; do + case ${opt} in + h) + show_help + exit 1 + ;; + r) + remote_host="$OPTARG" + ;; + p) + remote_path="$OPTARG" + ;; + i) + deploy_id="$OPTARG" + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 + ;; + :) + echo "The option -$OPTARG requires an argument" >&2 + exit 1 + ;; + esac +done + +if [ -z "${remote_host}" ] || [ -z "${remote_path}" ] || [ -z "${deploy_id}" ]; then + show_help + exit 1 +fi + +echo "syncing ${PWD}/ to ${remote_host}:${remote_path}/${deploy_id}/" + +rsync -vAax --exclude '.git*' --exclude .composer/ \ + -e "ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \ + ./ "${remote_host}:${remote_path}/${deploy_id}/" + +ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${remote_host}" " + set -e + + if [[ -f \"${remote_path}/current/config/config.php\" ]]; then + echo \"Config backup\" + cp \"${remote_path}/current/config/config.php\" \"${deploy_id}-config.php\" + fi + + echo \"Changing symlink\" + unlink \"${remote_path}/current\" && ln -s \"${remote_path}/${deploy_id}\" \"${remote_path}/current\" + + if [[ -f \"${deploy_id}-config.php\" ]]; then + echo \"Restoring config\" + cp \"${deploy_id}-config.php\" \"${remote_path}/current/config/config.php\" + fi +" diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index f1569a61..00000000 --- a/deploy.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env bash - -set -e - -remote_host= -remote_path= -deploy_id= - -show_help(){ - echo "Usage: $0 [OPTION]..." >&2 - echo "Deploys a software with rsync over ssh" >&2 - echo "The options -i, -p and -r are required" >&2 - echo "" >&2 - echo " -h Display this help screen" >&2 - echo " -i Sets the id, a unique name for the deployment" >&2 - echo " -p Define the base path on the server" >&2 - echo " -r The remote server name and user" >&2 -} - -while getopts ":hi:p:r:" opt; do - case ${opt} in - h) - show_help - exit 1 - ;; - r) - remote_host="$OPTARG" - ;; - p) - remote_path="$OPTARG" - ;; - i) - deploy_id="$OPTARG" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - exit 1 - ;; - :) - echo "The option -$OPTARG requires an argument" >&2 - exit 1 - ;; - esac -done - -if [ -z "${remote_host}" ] || [ -z "${remote_path}" ] || [ -z "${deploy_id}" ]; then - show_help - exit 1 -fi - -echo "syncing ${PWD}/ to ${remote_host}:${remote_path}/${deploy_id}/" - -rsync -vAax --exclude '.git*' --exclude .composer/ \ - -e "ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \ - ./ "${remote_host}:${remote_path}/${deploy_id}/" - -ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "${remote_host}" " - set -e - - if [[ -f \"${remote_path}/current/config/config.php\" ]]; then - echo \"Config backup\" - cp \"${remote_path}/current/config/config.php\" \"${deploy_id}-config.php\" - fi - - echo \"Changing symlink\" - unlink \"${remote_path}/current\" && ln -s \"${remote_path}/${deploy_id}\" \"${remote_path}/current\" - - if [[ -f \"${deploy_id}-config.php\" ]]; then - echo \"Restoring config\" - cp \"${deploy_id}-config.php\" \"${remote_path}/current/config/config.php\" - fi -" -- cgit v1.2.3-54-g00ecf