From 81630832e566eafc716e169433dacb73aafc6fb1 Mon Sep 17 00:00:00 2001
From: Praveen Arimbrathodiyil <praveen@debian.org>
Date: Tue, 5 Apr 2016 21:31:44 +0530
Subject: [PATCH] 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 ffe1a07beb..af98cfae7c 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 2768d6bb57..eec63a9166 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..."