[DRE-commits] [gitlab] 01/01: remove gitlab_conf variable

[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 81630832e566eafc716e169433dacb73aafc6fb1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Apr 5 21:31:44 2016 +0530

    remove gitlab_conf variable
---
 debian/conf/gitlab-debian.conf | 1 -
 debian/rake-tasks.sh           | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/conf/gitlab-debian.conf b/debian/conf/gitlab-debian.conf
index ffe1a07..af98cfa 100644
--- a/debian/conf/gitlab-debian.conf
+++ b/debian/conf/gitlab-debian.conf
@@ -1,7 +1,6 @@
 RAILS_ENV=production
 DB=postgres
 gitlab_user=gitlab
-gitlab_conf=/etc/gitlab.conf
 gitlab_app_root=/usr/share/gitlab
 gitlab_data_dir=/var/lib/gitlab
 gitlab_scripts=/usr/lib/gitlab/scripts
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 2768d6b..eec63a9 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -37,8 +37,8 @@ fi
 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
+chown ${gitlab_user}: ${gitlab_app_root}/config/secrets.yml
+chmod 0700 ${gitlab_app_root}/config/secrets.yml
 
 
 echo "Precompiling assets..."

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