Pirate, On 2017-03-14 14:26, Pirate Praveen wrote: > #856606 was introduced by gitlab 8.13.11+dfsg-4, which is now fixed in > 8.13.11+dfsg-5. Please unblock.
why can't you post the *CORRECT* debdiff? The diff between -4 and -5 as found in the archive looks much better and should actually fix the issue ... Attaching this diff as well as one from -2 to -5 for completeness. Andreas
diff -Nru gitlab-8.13.11+dfsg/debian/changelog
gitlab-8.13.11+dfsg/debian/changelog
--- gitlab-8.13.11+dfsg/debian/changelog 2017-02-24 12:36:52.000000000
+0100
+++ gitlab-8.13.11+dfsg/debian/changelog 2017-03-14 12:51:21.000000000
+0100
@@ -1,3 +1,11 @@
+gitlab (8.13.11+dfsg-5) unstable; urgency=medium
+
+ * Move variables used only in maintainer scripts to /usr/lib from /etc
+ (Closes: #856606)
+ * Use command -v to check existence of dropdb command in postrm
+
+ -- Pirate Praveen <prav...@debian.org> Tue, 14 Mar 2017 17:21:21 +0530
+
gitlab (8.13.11+dfsg-4) unstable; urgency=medium
[ Balasankar C ]
diff -Nru gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.conf.example
gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.conf.example
--- gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.conf.example 2017-02-24
12:36:52.000000000 +0100
+++ gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.conf.example 2017-03-14
12:51:21.000000000 +0100
@@ -2,27 +2,4 @@
DB=postgres
gitlab_app_root=/usr/share/gitlab
gitlab_data_dir=/var/lib/gitlab
-gitlab_cache_path=/var/cache/gitlab
-gitlab_scripts=/usr/lib/gitlab/scripts
-gitlab_yml_example=/usr/lib/gitlab/templates/gitlab.yml.example
-gitlab_yml_private=/var/lib/gitlab/gitlab.yml
-gitlab_yml=/etc/gitlab/gitlab.yml
-gitlab_debian_conf_example=/usr/lib/gitlab/templates/gitlab-debian.conf.example
-gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf
-gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
-gitlab_shell_config_example=/usr/lib/gitlab-shell/config.yml.example
-gitlab_shell_config_private=/var/lib/gitlab/gitlab-shell-config.yml
-gitlab_shell_config=/etc/gitlab-shell/config.yml
-gitlab_nginx_log=/var/log/gitlab
-gitlab_ssl_path=/etc/gitlab/ssl
-gitlab_shell_root=/usr/share/gitlab-shell
-gitlab_shell_log=/var/log/gitlab-shell
-gitlab_log_dir=/var/log/gitlab
gitlab_pid_path=/run/gitlab
-gitlab_tmpfiles_example=/usr/lib/gitlab/templates/tmpfiles.d/gitlab.conf.example
-gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab.conf
-gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf
-nginx_user=www-data
-nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example
-nginx_ssl_conf_example=/usr/lib/gitlab/templates/nginx.ssl.conf.example
-nginx_site_private=/var/lib/gitlab/nginx.conf
diff -Nru gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.defaults
gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.defaults
--- gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.defaults 1970-01-01
01:00:00.000000000 +0100
+++ gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.defaults 2017-03-14
12:51:21.000000000 +0100
@@ -0,0 +1,20 @@
+gitlab_cache_path=/var/cache/gitlab
+gitlab_scripts=/usr/lib/gitlab/scripts
+gitlab_yml_example=/usr/lib/gitlab/templates/gitlab.yml.example
+gitlab_yml_private=/var/lib/gitlab/gitlab.yml
+gitlab_yml=/etc/gitlab/gitlab.yml
+gitlab_shell_config_example=/usr/lib/gitlab-shell/config.yml.example
+gitlab_shell_config_private=/var/lib/gitlab/gitlab-shell-config.yml
+gitlab_shell_config=/etc/gitlab-shell/config.yml
+gitlab_nginx_log=/var/log/gitlab
+gitlab_ssl_path=/etc/gitlab/ssl
+gitlab_shell_root=/usr/share/gitlab-shell
+gitlab_shell_log=/var/log/gitlab-shell
+gitlab_log_dir=/var/log/gitlab
+gitlab_tmpfiles_example=/usr/lib/gitlab/templates/tmpfiles.d/gitlab.conf.example
+gitlab_tmpfiles_private=/var/lib/gitlab/tmpfiles.d-gitlab.conf
+gitlab_tmpfiles=/usr/lib/tmpfiles.d/gitlab.conf
+nginx_user=www-data
+nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example
+nginx_ssl_conf_example=/usr/lib/gitlab/templates/nginx.ssl.conf.example
+nginx_site_private=/var/lib/gitlab/nginx.conf
diff -Nru gitlab-8.13.11+dfsg/debian/install gitlab-8.13.11+dfsg/debian/install
--- gitlab-8.13.11+dfsg/debian/install 2017-02-24 12:36:52.000000000 +0100
+++ gitlab-8.13.11+dfsg/debian/install 2017-03-14 12:51:21.000000000 +0100
@@ -4,6 +4,7 @@
debian/conf/gitlab.yml.example usr/lib/gitlab/templates
debian/conf/resque.yml etc/gitlab
debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates
+debian/conf/gitlab-debian.defaults usr/lib/gitlab
debian/conf/*.target lib/systemd/system
debian/conf/smtp_settings.rb etc/gitlab/initializers
debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
diff -Nru gitlab-8.13.11+dfsg/debian/postinst
gitlab-8.13.11+dfsg/debian/postinst
--- gitlab-8.13.11+dfsg/debian/postinst 2017-02-24 12:36:52.000000000 +0100
+++ gitlab-8.13.11+dfsg/debian/postinst 2017-03-14 12:51:21.000000000 +0100
@@ -7,6 +7,17 @@
set -e
+# Setup variables
+# Now using gitlab-debian.defaults to override variables used only in
+# maintainer scripts. Earlier versions used gitlab-debian.conf for this.
+# Now gitlab-debian.conf will only have user/admin configurable variables
+# and variables required by systemd services.
+gitlab_debian_conf_example=/usr/lib/gitlab/templates/gitlab-debian.conf.example
+gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf
+gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
+gitlab_debian_defaults=/usr/lib/gitlab/gitlab-debian.defaults
+gitlab_debian_defaults_copy=/var/lib/gitlab/gitlab-debian.defaults
+
# Show debconf questions
. /usr/share/debconf/confmodule
@@ -34,7 +45,6 @@
#######################################################################
# Bootstrap config file - first try
-gitlab_debian_conf_example=/usr/lib/gitlab/templates/gitlab-debian.conf.example
export $(cat ${gitlab_debian_conf_example})
# second try
test -f ${gitlab_debian_conf_private} || \
@@ -44,6 +54,14 @@
# If /etc/gitlab/gitlab-debian.conf is already present, use it
test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
+# 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
+# versions with gitlab-debian.defaults)
+. ${gitlab_debian_defaults}
+
+# Copy defaults for use with postrm
+cp ${gitlab_debian_defaults} ${gitlab_debian_defaults_copy}
+
# Read gitlab_user from debconf db
db_get gitlab/user
gitlab_user=${RET:-gitlab} >/dev/null
diff -Nru gitlab-8.13.11+dfsg/debian/postrm gitlab-8.13.11+dfsg/debian/postrm
--- gitlab-8.13.11+dfsg/debian/postrm 2017-02-24 12:36:52.000000000 +0100
+++ gitlab-8.13.11+dfsg/debian/postrm 2017-03-14 12:51:21.000000000 +0100
@@ -6,6 +6,10 @@
# Abort if any command returns an error value
set -e
+# Set variables
+gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
+gitlab_debian_defaults=/var/lib/gitlab/gitlab-debian.defaults
+
# This script is called twice during the removal of the package; once
# after the removal of the package's files from the system, and as
# the final step in the removal of this package, after the package's
@@ -14,8 +18,8 @@
# Ensure the menu system is updated
# Read and export debian specific configuration
-gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
+. ${gitlab_debian_defaults}
case "$1" in
remove)
@@ -56,7 +60,7 @@
rm -rf ${gitlab_data_dir}
if [ ! -z "${gitlab_user}" ]; then
# Do only if gitlab_user is set
- if [ -x /usr/bin/dropdb ]; then
+ if command -v dropdb >/dev/null; then
echo "Removing Database: gitlab_production"
su ${gitlab_user} -c 'psql gitlab_production -c ""' && su
postgres -c "dropdb gitlab_production"
else
gitlab_8.13.11+dfsg-2.dsc..gitlab_8.13.11+dfsg-5.dsc.debdiff.gz
Description: application/gzip
