[DRE-commits] [gitlab] 01/02: use /usr/lib/gitlab/templates for config templates

[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 379bb9319127fd001fcef1379816fe72826ce3a0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Feb 20 16:41:19 2017 +0530

    use /usr/lib/gitlab/templates for config templates
---
 debian/conf/gitlab-debian.conf.example | 11 +++++------
 debian/postinst                        |  7 -------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/debian/conf/gitlab-debian.conf.example b/debian/conf/gitlab-debian.conf.example
index b849733..a871de8 100644
--- a/debian/conf/gitlab-debian.conf.example
+++ b/debian/conf/gitlab-debian.conf.example
@@ -4,13 +4,13 @@ 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/share/doc/gitlab/gitlab.yml.example
+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/share/doc/gitlab/gitlab-debian.conf.example
+gitlab_debian_conf_example=/usr/lib/gitlab/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/share/doc/gitlab-shell/config.yml.example
+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
@@ -19,10 +19,9 @@ 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/share/doc/gitlab/tmpfiles.d/gitlab.conf.example
+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/share/doc/gitlab/nginx.conf.example
-nginx_ssl_conf_example_gz=/usr/share/doc/gitlab/nginx.ssl.conf.example.gz
+nginx_conf_example=/usr/lib/gitlab/templates/nginx.conf.example
 nginx_site_private=/var/lib/gitlab/nginx.conf
diff --git a/debian/postinst b/debian/postinst
index 7f588d8..f66bf46 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -162,13 +162,6 @@ EOF
 	fi
         
         mkdir -p /etc/gitlab/ssl
-        if [ -f "${nginx_ssl_conf_example_gz}" ]; then
-          # undo dh_installdocs auto compress
-	  export nginx_conf_example_tmp=$(mktemp)
-	  zcat ${nginx_ssl_conf_example_gz} > ${nginx_conf_example_tmp}
-	  export nginx_conf_example=${nginx_conf_example_tmp}
-	fi
-
         # Check if letsencrypt option is selected
         db_get gitlab/letsencrypt
         if [ "${RET}" = "true" ]; then

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