Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package gitlab This fixes RC bug #857967. Also sine the version in stretch is currently not installable, please reduce the age. debdiff with 8.13.11+dfsg-5 attached (changes upto this version is already approved) unblock gitlab/8.13.11+dfsg-6 -- System Information: Debian Release: 9.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=ml_IN.UTF-8, LC_CTYPE=ml_IN.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru gitlab-8.13.11+dfsg/debian/changelog gitlab-8.13.11+dfsg/debian/changelog
--- gitlab-8.13.11+dfsg/debian/changelog 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/changelog 2017-03-17 22:29:40.000000000 +0530
@@ -1,3 +1,9 @@
+gitlab (8.13.11+dfsg-6) unstable; urgency=medium
+
+ * Improve configuration file parsing by using source (Closes: #857967)
+
+ -- Pirate Praveen <praveen@debian.org> Fri, 17 Mar 2017 22:29:40 +0530
+
gitlab (8.13.11+dfsg-5) unstable; urgency=medium
* Move variables used only in maintainer scripts to /usr/lib from /etc
diff -Nru gitlab-8.13.11+dfsg/debian/conf/gitlab gitlab-8.13.11+dfsg/debian/conf/gitlab
--- gitlab-8.13.11+dfsg/debian/conf/gitlab 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/conf/gitlab 2017-03-17 18:05:51.000000000 +0530
@@ -7,9 +7,8 @@
# Normal values are "production", "test" and "development".
RAILS_ENV="production"
-# Read and export debian specific configuration
-# Only exported variables will be passed on to gitlab app
-export $(cat /etc/gitlab/gitlab-debian.conf)
+# Read debian specific configuration
+. /etc/gitlab/gitlab-debian.conf
# app_user defines the user that GitLab is run as.
# The default is "git".
diff -Nru gitlab-8.13.11+dfsg/debian/gitlab-check.sh gitlab-8.13.11+dfsg/debian/gitlab-check.sh
--- gitlab-8.13.11+dfsg/debian/gitlab-check.sh 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/gitlab-check.sh 2017-03-17 21:42:48.000000000 +0530
@@ -2,12 +2,12 @@
set -e
-# Read and export debian specific configuration
-# Only exported variables will be passed on to gitlab app
-export $(cat /etc/gitlab/gitlab-debian.conf)
+# Read debian specific configuration
+. /etc/gitlab/gitlab-debian.conf
+export DB RAILS_ENV
+
cd /usr/share/gitlab
# Check gitlab is configured correctly
printf "Check if Gitlab is configured correctly...\n"
-su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:check RAILS_ENV=production'
-
+su ${gitlab_user} -s /bin/sh -c 'bundle exec rake gitlab:check'
diff -Nru gitlab-8.13.11+dfsg/debian/postinst gitlab-8.13.11+dfsg/debian/postinst
--- gitlab-8.13.11+dfsg/debian/postinst 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/postinst 2017-03-17 21:58:12.000000000 +0530
@@ -40,19 +40,19 @@
# `abort-remove' or `abort-deconfigure'.
#######################################################################
-# Read and export debian specific configuration
-# Only exported variables will be passed on to gitlab app
+# Read debian specific configuration
#######################################################################
# Bootstrap config file - first try
-export $(cat ${gitlab_debian_conf_example})
+. ${gitlab_debian_conf_example}
# second try
test -f ${gitlab_debian_conf_private} || \
cp ${gitlab_debian_conf_example} ${gitlab_debian_conf_private}
-export $(cat ${gitlab_debian_conf_private})
+. ${gitlab_debian_conf_private}
# If /etc/gitlab/gitlab-debian.conf is already present, use it
-test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
+test -f ${gitlab_debian_conf} && . ${gitlab_debian_conf}
+export DB RAILS_ENV
# Read default values (we cannot do this before gitlab-debian.conf is exported
# as we want to override variables set by gitlab-debian.conf in earlier gitlab
@@ -76,7 +76,7 @@
#######################################################################
# update Gemfile.lock, always
#######################################################################
-su ${gitlab_user} -s /bin/sh -c 'truncate -s 0 ${gitlab_data_dir}/Gemfile.lock'
+su ${gitlab_user} -s /bin/sh -c "truncate -s 0 ${gitlab_data_dir}/Gemfile.lock"
cd ${gitlab_app_root}
if ! su ${gitlab_user} -s /bin/sh -c 'bundle --local --quiet'; then
if [ "$1" = "triggered" ]; then
diff -Nru gitlab-8.13.11+dfsg/debian/postrm gitlab-8.13.11+dfsg/debian/postrm
--- gitlab-8.13.11+dfsg/debian/postrm 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/postrm 2017-03-17 18:08:07.000000000 +0530
@@ -17,8 +17,8 @@
# Ensure the menu system is updated
-# Read and export debian specific configuration
-test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
+# Read debian specific configuration
+test -f ${gitlab_debian_conf} && . ${gitlab_debian_conf}
. ${gitlab_debian_defaults}
case "$1" in
diff -Nru gitlab-8.13.11+dfsg/debian/rake-tasks.sh gitlab-8.13.11+dfsg/debian/rake-tasks.sh
--- gitlab-8.13.11+dfsg/debian/rake-tasks.sh 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/rake-tasks.sh 2017-03-17 21:59:34.000000000 +0530
@@ -2,9 +2,10 @@
set -e
-# Read and export debian specific configuration
-# Only exported variables will be passed on to gitlab app
-export $(cat /etc/gitlab/gitlab-debian.conf)
+# Read debian specific configuration
+. /etc/gitlab/gitlab-debian.conf
+export DB RAILS_ENV
+
cd /usr/share/gitlab
# Check if the db is already present
@@ -25,4 +26,4 @@
chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
echo "Precompiling assets..."
-su ${gitlab_user} -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile RAILS_ENV=production'
+su ${gitlab_user} -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
diff -Nru gitlab-8.13.11+dfsg/debian/tests/spec gitlab-8.13.11+dfsg/debian/tests/spec
--- gitlab-8.13.11+dfsg/debian/tests/spec 2017-03-14 17:21:21.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/tests/spec 2017-03-17 22:29:40.000000000 +0530
@@ -18,11 +18,12 @@
cd /usr/share/gitlab
su gitlab -c 'truncate -s 0 Gemfile.lock'
-export $(cat /etc/gitlab/gitlab-debian.conf)
+. /etc/gitlab/gitlab-debian.conf
+export RAILS_ENV=test
+export DB=postgres
export INCLUDE_TEST_DEPENDS="true"
su gitlab -c "bundle install --local"
su gitlab -c "mkdir -p tmp/tests/gitlab-shell"
-export RAILS_ENV=test
export dbname=gitlab_test
su postgres -c "createdb $dbname"
# enable the pg_trgm extension
Attachment:
signature.asc
Description: OpenPGP digital signature