export all variables in gitlab-debian.conf

This commit is contained in:
Praveen Arimbrathodiyil 2016-02-09 22:41:02 +05:30
parent c2604b1c2c
commit 3a1a6bd420
3 changed files with 6 additions and 13 deletions

3
debian/conf/gitlab vendored
View file

@ -11,9 +11,6 @@ RAILS_ENV="production"
# Only exported variables will be passed on to gitlab app # Only exported variables will be passed on to gitlab app
for i in $(cat /etc/gitlab/gitlab-debian.conf); do export $i; done for i in $(cat /etc/gitlab/gitlab-debian.conf); do export $i; done
# DB needs to be exported for some commands
export DB=${DB}
# app_user defines the user that GitLab is run as. # app_user defines the user that GitLab is run as.
# The default is "git". # The default is "git".
app_user=${gitlab_user} app_user=${gitlab_user}

8
debian/postinst vendored
View file

@ -31,12 +31,10 @@ case "$1" in
# Show debconf questions # Show debconf questions
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
# Read debian specific configuration # Read and export debian specific configuration
# Only exported variables will be passed on to gitlab app
gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
. ${gitlab_debian_conf} for i in $(cat ${gitlab_debian_conf}); do export $i; done
# export DB for su command
export DB=${DB}
# Create gitlab user # Create gitlab user
. /usr/lib/gitlab/scripts/adduser.sh . /usr/lib/gitlab/scripts/adduser.sh

View file

@ -1,9 +1,7 @@
#! /bin/sh #! /bin/sh
# Read configuration values # Read and export debian specific configuration
. /etc/gitlab/gitlab-debian.conf # Only exported variables will be passed on to gitlab app
for i in $(cat /etc/gitlab/gitlab-debian.conf); do export $i; done
# export DB for su
export DB=${DB}
echo "Initializing database..." echo "Initializing database..."
su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:setup RAILS_ENV=production force=yes' su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:setup RAILS_ENV=production force=yes'