[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 10c4f870f12e81fa00853d6dfc4518f34f8a5c4b
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Thu Feb 16 18:42:46 2012 +0100

    FIX #118

diff --git a/contrib/alternative-installation/shinken-install/nagvis.multisite.uri.patch b/contrib/alternative-installation/shinken-install/nagvis.multisite.uri.patch
index ac5b4ec..6279030 100644
--- a/contrib/alternative-installation/shinken-install/nagvis.multisite.uri.patch
+++ b/contrib/alternative-installation/shinken-install/nagvis.multisite.uri.patch
@@ -14,7 +14,7 @@
 +hostgroupurl="/check_mk/view.py?view_name=hostgroup&hostgroup=[hostgroup_name]"
  ; URL template for service object links
 -;serviceurl="[htmlcgi]/extinfo.cgi?type=2&host=[host_name]&service=[service_description]"
-+serviceurl="view.py?view_name=service&site=default&service=[service_description]&host=[host_name]"
++serviceurl="/check_mk/view.py?view_name=service&site=default&service=[service_description]&host=[host_name]"
  ; URL template for servicegroup object links
 -;servicegroupurl="[htmlcgi]/status.cgi?servicegroup=[servicegroup_name]&style=detail"
 +servicegroupurl="/check_mk/view.py?view_name=servicegroup&servicegroup=[servicegroup_name]"
diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index 66c9bb2..48ef9b9 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -154,6 +154,7 @@ export PNPYUMPKG="rrdtool httpd php rrdtool-perl php-gd perl-Time-HiRes"
 export NAGVIS="http://downloads.sourceforge.net/project/nagvis/NagVis%201.6/nagvis-1.6.3.tar.gz"
 export NAGVISPREFIX="/usr/local/nagvis"
 export NAGVISAPTPKGS="apache2 libapache2-mod-php5 php5-gd php5-sqlite php-net-socket php5-mysql graphviz"
+export NAGVISYUMPKGS="httpd php php-gd php-sqlite php-mysql graphviz"
 
 export MKVER="1.1.12p6"
 export MKURI="http://mathias-kettner.de/download/check_mk-$MKVER.tar.gz"
diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 8c3af0d..650d3d6 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -916,11 +916,14 @@ function fixHtpasswdPath(){
 
 function install_nagvis(){
 
-    cadre "Install pnp4nagios addon" green
+    cadre "Install nagvis addon" green
     case $CODE in
         REDHAT)
-            cecho " > Unsupported" red
-            exit 2
+            yum install -y $NAGVISYUMPKGS >> /tmp/shinken.install.log 2>&1
+            HTTPDUSER="apache"
+            HTTPDGROUP="apache"
+            HTTPDCONF="/etc/httpd/conf.d"
+            HTTPDINIT="/etc/init.d/httpd"
             ;;
         DEBIAN)
             cecho " > Installing prerequisites" green
@@ -928,6 +931,7 @@ function install_nagvis(){
             HTTPDUSER="www-data"
             HTTPDGROUP="www-data"
             HTTPDCONF="/etc/apache2/conf.d"
+            HTTPDINIT="/etc/init.d/apache2"
             ;;
         *)
             cecho " > Unknown distribution : $DIST" red
@@ -970,7 +974,9 @@ function install_nagvis(){
             cd $NAGVISPREFIX/etc
             patch < $myscripts/nagvis.multisite.uri.patch
         fi
-    fi  
+    fi 
+    cecho " > Restart Apache " green
+    $HTTPDINIT restart >> /tmp/shinken.install.log 2>&1 
 }
 
 # mk multisite

-- 
UNNAMED PROJECT