[DRE-commits] [gitlab] 01/08: read gitlab-debian.conf for env variables

[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 638edb5111b0e7b56df19c2bd4766ae200933ae4
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jan 25 07:50:50 2016 +0530

    read gitlab-debian.conf for env variables
---
 debian/conf/gitlab | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/conf/gitlab b/debian/conf/gitlab
index 87ec26f..7762273 100755
--- a/debian/conf/gitlab
+++ b/debian/conf/gitlab
@@ -10,13 +10,16 @@ RAILS_ENV="production"
 # Database selection
 export DB="postgres"
 
+# Read debian specific configuration
+. /etc/gitlab/gitlab-debian.conf
+
 # app_user defines the user that GitLab is run as.
 # The default is "git".
-app_user="gitlab"
+app_user=${gitlab_user}
 
 # app_root defines the folder in which gitlab and it's components are installed.
 # The default is "/home/$app_user/gitlab"
-app_root="/usr/share/gitlab"
+app_root=${gitlab_home}
 
 # pid_path defines a folder in which the gitlab and it's components place their pids.
 # This variable is also used below to define the relevant pids for the gitlab components.

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