[DRE-commits] [gitlab] 01/01: use maintscript

[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 398a37ae5956964b361b5023f52f567769cb5958
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Jun 19 20:17:07 2016 +0530

    use maintscript
---
 debian/conf/gitlab-debian.conf     | 1 +
 debian/conf/tmpfiles.d/gitlab.conf | 2 +-
 debian/maintscript                 | 2 ++
 debian/postinst                    | 1 -
 debian/rake-tasks.sh               | 4 ----
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/conf/gitlab-debian.conf b/debian/conf/gitlab-debian.conf
index 892ffab..8800fdc 100644
--- a/debian/conf/gitlab-debian.conf
+++ b/debian/conf/gitlab-debian.conf
@@ -3,6 +3,7 @@ DB=postgres
 gitlab_user=gitlab
 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_private=/var/lib/gitlab/gitlab.yml
 gitlab_yml=/etc/gitlab/gitlab.yml
diff --git a/debian/conf/tmpfiles.d/gitlab.conf b/debian/conf/tmpfiles.d/gitlab.conf
index 3265fd2..95bae81 100644
--- a/debian/conf/tmpfiles.d/gitlab.conf
+++ b/debian/conf/tmpfiles.d/gitlab.conf
@@ -1,2 +1,2 @@
 d /run/gitlab 2750 gitlab www-data -
-L /run/gitlab/cache - - - - /var/lib/gitlab/cache
+L /run/gitlab/cache - - - - /var/cache/gitlab
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..58e5cd8
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/gitlab/initializers/devise_async.rb 8.8.2+dfsg-5 gitlab
+dir_to_symlink /run/gitlab/cache /var/cache/gitlab
diff --git a/debian/postinst b/debian/postinst
index 542bee0..26021e3 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -44,7 +44,6 @@ case "$1" in
 
     gitlab_builds_log=${gitlab_log_dir}/builds
     gitlab_repo_path=${gitlab_data_dir}/repositories
-    gitlab_cache_path=${gitlab_data_dir}/cache
     gitlab_uploads_path=${gitlab_data_dir}/public/uploads
 
     # Create directories and change ownership
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 4492bc6..cbc78c6 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -19,10 +19,6 @@ if ! [ -f "${gitlab_app_root}/config/secrets.yml" ]; then
 
 fi
 
-# Remove config files (already removed by upstream)
-dpkg-maintscript-helper rm_conffile \
-  /etc/gitlab/initializers/devise_async.rb 8.8.2+dfsg-5 gitlab -- "$@"
-
 # Check if the db is already present
 if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \
 "No relations found." ]; then

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