[DRE-commits] [gitlab] 01/01: update install file and nginx conf files

[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 0c01eefe991dda111606ec2ed79fa000d6f46ec8
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Feb 20 17:03:20 2017 +0530

    update install file and nginx conf files
---
 debian/conf/gitlab-debian.conf.example | 1 +
 debian/gitlab.docs                     | 2 --
 debian/install                         | 8 +++++---
 debian/postinst                        | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/conf/gitlab-debian.conf.example b/debian/conf/gitlab-debian.conf.example
index a871de8..c623c8b 100644
--- a/debian/conf/gitlab-debian.conf.example
+++ b/debian/conf/gitlab-debian.conf.example
@@ -24,4 +24,5 @@ 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 --git a/debian/gitlab.docs b/debian/gitlab.docs
index 6cf53da..389dbb9 100644
--- a/debian/gitlab.docs
+++ b/debian/gitlab.docs
@@ -1,4 +1,2 @@
 README.md
 debian/README.Debian
-debian/conf/nginx.conf.example
-debian/conf/nginx.ssl.conf.example
diff --git a/debian/install b/debian/install
index 9dfdbea..6217672 100644
--- a/debian/install
+++ b/debian/install
@@ -1,12 +1,14 @@
 debian/conf/gitlab etc/default
 debian/conf/unicorn.rb etc/gitlab
 debian/conf/database.yml etc/gitlab
-debian/conf/gitlab.yml.example usr/share/doc/gitlab
+debian/conf/gitlab.yml.example usr/lib/gitlab/templates
 debian/conf/resque.yml etc/gitlab
-debian/conf/gitlab-debian.conf.example usr/share/doc/gitlab
+debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates
 debian/conf/*.target lib/systemd/system
 debian/conf/smtp_settings.rb etc/gitlab/initializers
-debian/conf/tmpfiles.d/gitlab.conf.example usr/share/doc/gitlab/tmpfiles.d
+debian/conf/tmpfiles.d/gitlab.conf.example usr/lib/gitlab/templates/tmpfiles.d
+debian/conf/nginx.conf.example usr/lib/gitlab/templates
+debian/conf/nginx.ssl.conf.example usr/lib/gitlab/templates
 debian/adduser.sh usr/lib/gitlab/scripts
 debian/grantpriv.sh usr/lib/gitlab/scripts
 debian/rake-tasks.sh usr/lib/gitlab/scripts
diff --git a/debian/postinst b/debian/postinst
index f66bf46..a3cdb21 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -162,6 +162,8 @@ EOF
 	fi
         
         mkdir -p /etc/gitlab/ssl
+        nginx_conf_example=${nginx_ssl_conf_example}
+
         # 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