export all variables in gitlab-debian.conf

debian/conf/gitlab

@@ -11,9 +11,6 @@ RAILS_ENV="production"
 # Only exported variables will be passed on to gitlab app
 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.
 # The default is "git".
 app_user=${gitlab_user}

debian/postinst

@@ -31,12 +31,10 @@ case "$1" in
     # Show debconf questions
     . /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}
-
-    # export DB for su command
-    export DB=${DB}
+    for i in $(cat ${gitlab_debian_conf}); do export $i; done
 
     # Create gitlab user
     . /usr/lib/gitlab/scripts/adduser.sh

debian/rake-tasks.sh

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