[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.1-4-14-g1c7099f

[Markus Frosch]

The following commit has been merged in the master branch:
commit 380ebed1484f256c9d6b2620c0d76b5eb036e234
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Aug 13 14:37:59 2012 +0200

    integrating icinga-doc as suggested package
    
    The docs are now available via /icinga-web/docs/
    and the cronks will use the correct URLs.
    
    Closes: #692358

diff --git a/debian/apache2.conf b/debian/apache2.conf
index d3ef2a9..e56988d 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -14,6 +14,8 @@
 AliasMatch "^/icinga-web/modules/([A-Za-z0-9]+)/resources/styles/([A-Za-z0-9]+\.css)$" "/usr/share/icinga-web/app/modules/$1/pub/styles/$2"
 AliasMatch "^/icinga-web/modules/([A-Za-z0-9]+)/resources/images/([A-Za-z_\-0-9]+\.(?:png|gif|jpg))$" "/usr/share/icinga-web/app/modules/$1/pub/images/$2"
 
+# Allow access to the docs via icinga-web
+Alias /icinga-web/docs/ /usr/share/icinga/htdocs/docs/
 # Matching for Icinga Web and the ext3 framework
 Alias /icinga-web/js/ext3/ /usr/share/icinga-web/lib/ext3/
 Alias /icinga-web/ /usr/share/icinga-web/pub/
@@ -40,6 +42,13 @@ RedirectMatch "^/icinga-web$" /icinga-web/
     Allow from all
 </Directory>
 
+# Access to the docs (via icinga-doc)
+<DirectoryMatch "/usr/share/icinga/htdocs/docs/">
+    DirectoryIndex index.html
+    Order Allow,Deny
+    Allow From All
+</DirectoryMatch>
+
 # Access to the public web folder of Icinga Web
 <Directory "/usr/share/icinga-web/pub/">
     DirectoryIndex index.php
diff --git a/debian/control b/debian/control
index c0017df..64996be 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Depends: dbconfig-common,
          ucf,
          ${misc:Depends}
 Recommends: apache2 | httpd, mysql-client | postgresql-client
+Suggests: icinga-doc
 Description: host and network monitoring system - modern web interface
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
diff --git a/debian/cronks.xml b/debian/cronks.xml
index d9141ae..fcbf5de 100644
--- a/debian/cronks.xml
+++ b/debian/cronks.xml
@@ -39,6 +39,35 @@
             </cronk>
         -->
         
+        <!-- set correct url for docs -->
+            <cronk name="iframeViewIcingaDocsEn">
+                <ae:parameter name="module">Cronks</ae:parameter>
+                <ae:parameter name="action">System.IframeView</ae:parameter>
+                <ae:parameter name="hide">false</ae:parameter>
+                <ae:parameter name="description">Icinga docs english version</ae:parameter>
+                <ae:parameter name="name">Docs EN</ae:parameter>
+                <ae:parameter name="image">cronks.Info2</ae:parameter>
+                <ae:parameter name="categories">misc</ae:parameter>
+                <ae:parameter name="position">300</ae:parameter>
+                <ae:parameter name="ae:parameter">
+                    <ae:parameter name="url"><![CDATA[/icinga-web/docs/en/index.html]]></ae:parameter>
+                </ae:parameter>
+            </cronk>
+
+            <cronk name="iframeViewIcingaDocsDe">
+                <ae:parameter name="module">Cronks</ae:parameter>
+                <ae:parameter name="action">System.IframeView</ae:parameter>
+                <ae:parameter name="hide">false</ae:parameter>
+                <ae:parameter name="description">Icinga docs german version</ae:parameter>
+                <ae:parameter name="name">Docs DE</ae:parameter>
+                <ae:parameter name="image">cronks.Info2</ae:parameter>
+                <ae:parameter name="categories">misc</ae:parameter>
+                <ae:parameter name="position">310</ae:parameter>
+                 <ae:parameter name="ae:parameter">
+                    <ae:parameter name="url"><![CDATA[/icinga-web/docs/de/index.html]]></ae:parameter>
+                </ae:parameter>
+            </cronk>
+
         <!-- Disable default activated cronks -->
             <cronk name="icingaReportingDefault">
                 <ae:parameter name="module">Reporting</ae:parameter>

-- 
Debian packaging of icinga-web