[omd-commits] OMD Git: omd: shinken: remove leftover apache.conf ( will be created by a hook)

git version control git at mathias-kettner.de
Thu Dec 8 18:23:36 CET 2011


Module:   omd
Branch:   master
Commit:   06ec1168dafe85724b67515e945a23665309f5bd
URL:      http://omdistro.org/projects/omd/repository/revisions/06ec1168dafe85724b67515e945a23665309f5bd

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Dec  8 16:38:19 2011 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Dec  8 16:38:19 2011 +0100

shinken: remove leftover apache.conf (will be created by a hook)

---

 packages/shinken/skel/etc/shinken/apache.conf |   29 -------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/packages/shinken/skel/etc/shinken/apache.conf b/packages/shinken/skel/etc/shinken/apache.conf
deleted file mode 100644
index 54c900d..0000000
--- a/packages/shinken/skel/etc/shinken/apache.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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>



More information about the omd-commits mailing list