[DRE-commits] [diaspora-installer] 02/03: move nginx.conf.example outside /usr/share/doc

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository diaspora-installer.

commit 5b3436a5d36bae55a1458b0e676d4946a472e355
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Aug 22 20:45:04 2016 +0530

    move nginx.conf.example outside /usr/share/doc
---
 debian/changelog               | 7 ++++---
 debian/control                 | 1 -
 debian/diaspora-common.docs    | 1 -
 debian/diaspora-common.install | 5 +++--
 diaspora-common.conf           | 1 +
 set-env-nginx.sh               | 2 --
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6298fea..df85dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-diaspora-installer (0.5.9.1+debian5) UNRELEASED; urgency=medium
+diaspora-installer (0.5.9.1+debian5) unstable; urgency=medium
 
   * Move ca-certificates to diaspora-common Pre-Depends (autopkgtest fails
-    otherwise because the ca certificates are configured only after diaspora)  
+    otherwise because ca certificates are configured only after diaspora)
+  * Move nginx.conf.example to /usr/share/diaspora-common (Closes: #834090)
 
- -- Pirate Praveen <praveen at debian.org>  Mon, 22 Aug 2016 13:25:16 +0530
+ -- Pirate Praveen <praveen at debian.org>  Mon, 22 Aug 2016 22:16:30 +0530
 
 diaspora-installer (0.5.9.1+debian4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3ff976d..ea0f068 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,6 @@ Pre-Depends: ca-certificates
 Depends: adduser,
          dbconfig-pgsql | dbconfig-mysql | dbconfig-no-thanks,
          postgresql | mysql-server,
-         ca-certificates,
          curl,
          exim4 | postfix | mail-transport-agent,
          net-tools,
diff --git a/debian/diaspora-common.docs b/debian/diaspora-common.docs
index acd7bdd..e845566 100644
--- a/debian/diaspora-common.docs
+++ b/debian/diaspora-common.docs
@@ -1,2 +1 @@
 README
-nginx.conf.example
diff --git a/debian/diaspora-common.install b/debian/diaspora-common.install
index 1817f0f..445acd6 100644
--- a/debian/diaspora-common.install
+++ b/debian/diaspora-common.install
@@ -1,9 +1,10 @@
 adduser.sh usr/lib/diaspora-common/scripts
-debian/database.yml /usr/share/diaspora-common/
+debian/database.yml usr/share/diaspora-common
 diaspora-common.conf /etc/diaspora
+nginx.conf.example usr/share/diaspora-common
 diaspora-download.sh usr/lib/diaspora-common/scripts
 diaspora-versions.sh usr/lib/diaspora-common/scripts
-diaspora.conf /usr/share/diaspora-common/
+diaspora.conf usr/share/diaspora-common
 debian/diaspora.yml etc/diaspora
 grantpriv.sh usr/lib/diaspora-common/scripts
 rake-tasks.sh usr/lib/diaspora-common/scripts
diff --git a/diaspora-common.conf b/diaspora-common.conf
index 2ee2858..4edcaa2 100644
--- a/diaspora-common.conf
+++ b/diaspora-common.conf
@@ -14,3 +14,4 @@ export diaspora_cache=/var/cache/diaspora-installer
 export diaspora_scripts=/usr/lib/diaspora-common/scripts
 export diaspora_nginx_log=/var/log/diaspora
 export diaspora_ssl_path=/etc/diaspora/ssl
+export nginx_conf_example=/usr/share/diaspora-common/nginx.conf.example
diff --git a/set-env-nginx.sh b/set-env-nginx.sh
index 588a39a..b5d3df8 100755
--- a/set-env-nginx.sh
+++ b/set-env-nginx.sh
@@ -8,8 +8,6 @@ fi
 # Read configuration values
 . /etc/diaspora/diaspora-common.conf
 
-nginx_conf_example=/usr/share/doc/diaspora-common/nginx.conf.example
- 
 if ! grep SERVERNAME ${diaspora_conf_private}
 	then 
 		echo export SERVERNAME=$1 >> ${diaspora_conf_private}

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