[Pkg-nagios-changes] [pkg-nagvis] 05/08: Moved config file samples/defaults out of docs

[Markus Frosch]

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

lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.

commit b403fd4b688c579459a04c0be215a8de9b9f387b
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Dec 12 19:54:05 2013 +0100

    Moved config file samples/defaults out of docs
    
    Closes: #709956
---
 debian/nagvis.dirs     | 1 +
 debian/nagvis.docs     | 2 --
 debian/nagvis.install  | 1 +
 debian/nagvis.links    | 2 ++
 debian/nagvis.postinst | 8 ++++----
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/nagvis.dirs b/debian/nagvis.dirs
index 349018a..f7e3bf8 100644
--- a/debian/nagvis.dirs
+++ b/debian/nagvis.dirs
@@ -3,3 +3,4 @@ var/cache/nagvis/tmpl/cache
 var/cache/nagvis/tmpl/compile
 etc/nagvis/profiles
 etc/apache2/conf.d/
+usr/share/nagvis/defaults
diff --git a/debian/nagvis.docs b/debian/nagvis.docs
index cd23f36..e69de29 100644
--- a/debian/nagvis.docs
+++ b/debian/nagvis.docs
@@ -1,2 +0,0 @@
-etc/nagvis.ini.php-sample
-etc/apache2-nagvis.conf-sample
diff --git a/debian/nagvis.install b/debian/nagvis.install
index f6aade4..5b1044a 100644
--- a/debian/nagvis.install
+++ b/debian/nagvis.install
@@ -2,3 +2,4 @@ share/userfiles/ var/cache/nagvis
 share/ usr/share/nagvis
 docs/ usr/share/nagvis
 etc/* etc/nagvis
+etc/nagvis.ini.php-sample etc/apache2-nagvis.conf-sample usr/share/nagvis/defaults
diff --git a/debian/nagvis.links b/debian/nagvis.links
index a2c763e..3cd8d8e 100644
--- a/debian/nagvis.links
+++ b/debian/nagvis.links
@@ -4,3 +4,5 @@
 /etc/nagvis	/usr/share/nagvis/etc
 /var/cache/nagvis /usr/share/nagvis/var
 /usr/share/php/php-gettext /usr/share/nagvis/share/server/core/ext/php-gettext-1.0.9
+/usr/share/nagvis/defaults/nagvis.ini.php-sample /usr/share/doc/nagvis/nagvis.ini.php-sample
+/usr/share/nagvis/defaults/apache2-nagvis.conf-sample /usr/share/doc/nagvis/apache2-nagvis.conf-sample
diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index 83074e4..6512d9f 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -28,7 +28,7 @@ case "$1" in
 	    "icinga")
                 ## Creating Configuration file for Nagvis
                 nagvis_tmp=$(mktemp)
-                zcat /usr/share/doc/nagvis/nagvis.ini.php-sample.gz | sed \
+                cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
                   -e "s#;file_group=\"\"#file_group=\"www-data\"#g" \
                   -e "s#;file_mode=\"660\"#file_mode=\"660\"#g" \
                   -e "s#;base=\"/usr/local/nagvis/\"#base=\"/usr/share/nagvis/\"#" \
@@ -49,7 +49,7 @@ case "$1" in
                 sed -e "s#@NAGVIS_PATH@#/usr/share/nagvis/share/#g" \
                   -e "s#@NAGVIS_WEB@#/nagvis#g" \
                   -e "s#@NAGIOS_PATH@/etc#/etc/icinga#g" \
-                  < /usr/share/doc/nagvis/apache2-nagvis.conf-sample \
+                  < /usr/share/nagvis/defaults/apache2-nagvis.conf-sample \
                   > "$apache_tmp"
                 chmod go+r "$apache_tmp"
                 ucf --debconf-ok "$apache_tmp" /etc/apache2/conf.d/nagvis.conf
@@ -64,7 +64,7 @@ case "$1" in
             "nagios")
                 ## Creating Configuration file for Nagvis
                 nagvis_tmp=$(mktemp)
-                zcat /usr/share/doc/nagvis/nagvis.ini.php-sample.gz | sed \
+                cat /usr/share/nagvis/defaults/nagvis.ini.php-sample | sed \
                   -e "s#;file_group=\"\"#file_group=\"www-data\"#g" \
                   -e "s#;file_mode=\"660\"#file_mode=\"660\"#g" \
                   -e "s#;base=\"/usr/local/nagvis/\"#base=\"/usr/share/nagvis/\"#" \
@@ -85,7 +85,7 @@ case "$1" in
                 sed -e "s#@NAGVIS_PATH@#/usr/share/nagvis/share/#g" \
                   -e "s#@NAGVIS_WEB@#/nagvis#g" \
                   -e "s#@NAGIOS_PATH@/etc#/etc/nagios3#g" \
-                  < /usr/share/doc/nagvis/apache2-nagvis.conf-sample \
+                  < /usr/share/nagvis/defaults/apache2-nagvis.conf-sample \
                   > "$apache_tmp"
                 chmod go+r "$apache_tmp"
                 ucf --debconf-ok "$apache_tmp" /etc/apache2/conf.d/nagvis.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git