[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [omd-commits] OMD Git: omd: shinken: use own cgi.cfg+shinken.cfg for the old cgi gui
From:       git () mathias-kettner ! de (git version control)
Date:       2012-09-14 13:40:27
Message-ID: 20120914134028.B40CA840A7D () mail ! mathias-kettner ! de
[Download RAW message or body]

Module:   omd
Branch:   master
Commit:   19a75ee7295d74e2b3a8d103ce01c0b73ec07e1b
URL:      http://omdistro.org/projects/omd/repository/revisions/19a75ee7295d74e2b3a8d103ce01c0b73ec07e1b


Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Sep 14 03:58:21 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri Sep 14 03:58:21 2012 +0200

shinken: use own cgi.cfg+shinken.cfg for the old cgi gui

---

 packages/omd/CORE.hook                            |    2 +-
 packages/shinken/skel/etc/shinken/apache-cgi.conf |   29 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/packages/omd/CORE.hook b/packages/omd/CORE.hook
index ed6bf96..d991798 100755
--- a/packages/omd/CORE.hook
+++ b/packages/omd/CORE.hook
@@ -69,7 +69,7 @@ case "$1" in
         elif [ "$2" == "shinken" ]
         then
             # Thruk is the default interface, but classic is possible
-            make_link ../../nagios/apache.conf \
$OMD_ROOT/etc/apache/conf.d/nagios.conf +            make_link \
                ../../shinken/apache-cgi.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf
             make_link ../../icinga/apache.conf \
                $OMD_ROOT/etc/apache/conf.d/icinga.conf 
             make_link ../../shinken/apache.conf \
$OMD_ROOT/etc/apache/conf.d/shinken.conf  make_link shinken $OMD_ROOT/etc/init.d/core
diff --git a/packages/shinken/skel/etc/shinken/apache-cgi.conf \
b/packages/shinken/skel/etc/shinken/apache-cgi.conf new file mode 100644
index 0000000..54c900d
--- /dev/null
+++ b/packages/shinken/skel/etc/shinken/apache-cgi.conf
@@ -0,0 +1,29 @@
+# Apache configuration for access to Nagios web GUI
+
+# Handle locally installed files via the internal URI /noc/check_mk/local
+# These are files stored below local/share/check_mk/web/htdocs
+Alias /###SITE###/nagios/local ###ROOT###/local/share/nagios/htdocs
+<Directory ###ROOT###/local/share/nagios/htdocs>
+      Order deny,allow
+      allow from all
+</Directory>
+
+ScriptAlias /###SITE###/nagios/cgi-bin ###ROOT###/lib/nagios/cgi-bin
+<Directory ###ROOT###/lib/nagios/cgi-bin>
+  Order allow,deny
+  Allow from all
+  SetEnv NAGIOS_CGI_CONFIG "###ROOT###/etc/shinken/cgi.cfg"
+</Directory>
+
+Alias /###SITE###/nagios ###ROOT###/share/nagios/htdocs
+<Directory ###ROOT###/share/nagios/htdocs>
+  Order allow,deny
+  Allow from all
+  # Rewrite rules for handling the local-hierarchy. All URI to static
+  # files are redirected, if those exist in local/. Thus the user
+  # even can override shipped static files.
+  RewriteEngine on
+  RewriteCond "###ROOT###/local/share/nagios/htdocs/$1" "-f"
+  RewriteRule "(.*)" "/###SITE###/nagios/local/$1"
+
+</Directory>


[prev in list] [next in list] [prev in thread] [next in thread]