[DRE-commits] [gitlab] 02/02: move permissions change after gitlab shell is set

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit 9649e3b1dc1bd28f2876b2dcbddd98d5f4fcd417
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Apr 5 21:12:05 2016 +0530

    move permissions change after gitlab shell is set
---
 debian/rake-tasks.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 00a8a26..2768d6b 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -17,17 +17,9 @@ if ! [ -f "${gitlab_app_root}/config/secrets.yml" ]; then
   echo ${gitlab_app_secret} > ${gitlab_app_root}/.secret
   }
 
-# Restrict permissions for secret files
-
-chown ${gitlab_user}: ${gitlab_data_dir}/.secret
-chmod 0700 ${gitlab_data_dir}/.secret
-if [ -e ${gitlab_data_dir}/.gitlab_shell_secret ]; then
-  chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 fi
-chown ${gitlab_user}: ${gitlab_conf}/secrets.yml
-chmod 0700 ${gitlab_conf}/secrets.yml
 
-fi
+# Check if the db is already present
 if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \
 "No relations found." ]; then
   echo "Initializing database..."
@@ -41,6 +33,14 @@ else
   su ${gitlab_user} -s /bin/sh -c 'bundle exec rake db:migrate'
 fi
 
+# Restrict permissions for secret files
+chown ${gitlab_user}: ${gitlab_data_dir}/.secret
+chmod 0700 ${gitlab_data_dir}/.secret
+chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
+chown ${gitlab_user}: ${gitlab_conf}/secrets.yml
+chmod 0700 ${gitlab_conf}/secrets.yml
+
+
 echo "Precompiling assets..."
 su ${gitlab_user} -s /bin/sh -c 'bundle exec rake assets:precompile RAILS_ENV=production'
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git