Control: reopen -1 On ശനി 04 മാര്ച്ച് 2017 02:33 വൈകു, Niels Thykier wrote: > Unblocked, thanks. > ~Niels
#856606 was introduced by gitlab 8.13.11+dfsg-4, which is now fixed in 8.13.11+dfsg-5. Please unblock.
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 17:06:52.000000000
+0530
+++ gitlab-8.13.11+dfsg/debian/changelog 2017-03-14 17:21:21.000000000
+0530
@@ -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
17:06:52.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.conf.example 2017-03-14
17:21:21.000000000 +0530
@@ -2,3 +2,4 @@
DB=postgres
gitlab_app_root=/usr/share/gitlab
gitlab_data_dir=/var/lib/gitlab
+gitlab_pid_path=/run/gitlab
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 2017-02-24
17:06:52.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/conf/gitlab-debian.defaults 2017-03-14
17:21:21.000000000 +0530
@@ -1,5 +1,3 @@
-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
@@ -13,7 +11,6 @@
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
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 17:06:52.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/postinst 2017-03-14 17:21:21.000000000 +0530
@@ -8,6 +8,10 @@
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
@@ -50,7 +54,9 @@
# If /etc/gitlab/gitlab-debian.conf is already present, use it
test -f ${gitlab_debian_conf} && export $(cat ${gitlab_debian_conf})
-# Read default values
+# 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
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 17:06:52.000000000 +0530
+++ gitlab-8.13.11+dfsg/debian/postrm 2017-03-14 17:21:21.000000000 +0530
@@ -60,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
signature.asc
Description: OpenPGP digital signature
