From 5a7aeca1d87fae7b2382c62185b2bd7504a70930 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 26 Feb 2014 15:12:09 +0530 Subject: [PATCH] gitlab: moved backup keep time code block to start of script --- resources/gitlab | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/gitlab b/resources/gitlab index 0a46be45..ec7746d5 100755 --- a/resources/gitlab +++ b/resources/gitlab @@ -41,6 +41,11 @@ case "${DB_TYPE}" in *) echo "Unsupported database adapter. Available adapters are mysql and postgres." && exit 1 ;; esac +case "${GITLAB_BACKUPS}" in + daily|monthly) GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-604800} ;; + disable|*) GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-0} ;; +esac + # generate a password for root. ROOT_PASSWORD=$(pwgen -c -n -1 12) echo "root:$ROOT_PASSWORD" | chpasswd @@ -157,12 +162,6 @@ sudo -u git -H git config --global user.name "GitLab" sudo -u git -H git config --global user.email "${GITLAB_EMAIL}" sudo -u git -H git config --global core.autocrlf input -# setup backup keep_time if not specified -case "${GITLAB_BACKUPS}" in - daily|monthly) GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-604800} ;; - disable|*) GITLAB_BACKUP_EXPIRY=${GITLAB_BACKUP_EXPIRY:-0} ;; -esac - # configure server url sudo -u git -H sed 's/{{GITLAB_HOST}}/'${GITLAB_HOST}'/' -i /home/git/gitlab/config/gitlab.yml sudo -u git -H sed 's/{{GITLAB_PORT}}/'${GITLAB_PORT}'/' -i /home/git/gitlab/config/gitlab.yml