[DRE-commits] [gitlab] 03/05: fix path and remove on purge

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit e23803cc48c7fc5ceb2fd253c4e7a23c3528bcdf
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jun 3 22:11:46 2016 +0530

    fix path and remove on purge
---
 debian/conf/gitlab-debian.conf | 2 +-
 debian/postrm                  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/conf/gitlab-debian.conf b/debian/conf/gitlab-debian.conf
index 2db79ff..892ffab 100644
--- a/debian/conf/gitlab-debian.conf
+++ b/debian/conf/gitlab-debian.conf
@@ -8,7 +8,7 @@ gitlab_yml_private=/var/lib/gitlab/gitlab.yml
 gitlab_yml=/etc/gitlab/gitlab.yml
 gitlab_debian_conf_private=/var/lib/gitlab/gitlab-debian.conf
 gitlab_debian_conf=/etc/gitlab/gitlab-debian.conf
-gitlab_shell_config_private=/var/lib/gitlab-shell-config.yml
+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
diff --git a/debian/postrm b/debian/postrm
index 3d913aa..3c25b30 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -65,11 +65,13 @@ case "$1" in
       test -n "${nginx_site}" && ucf --purge ${nginx_site}
       test -n "${gitlab_debian_conf}" && ucf --purge ${gitlab_debian_conf}
       test -n "${gitlab_yml}" && ucf --purge ${gitlab_yml}
+      test -n "${gitlab_shell_config}" && ucf -purge ${gitlab_shell_config}
     fi    
     if which ucfr >/dev/null; then
       test -n "${nginx_site}" && ucfr --purge gitlab ${nginx_site}
       test -n "${gitlab_debian_conf}" && ucfr --purge gitlab ${gitlab_debian_conf}
       test -n "${gitlab_yml}" && ucfr --purge gitlab ${gitlab_yml}
+      test -n "${gitlab_shell_config}" && ucfr -purge gitlab ${gitlab_shell_config}
     fi
 
        # cleanup complete

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git