[icinga-checkins] icinga.org: icinga-doc/next: docs issue #4021: icinga-web / . htaccess has been removed

git at icinga.org git at icinga.org
Tue Apr 30 22:55:42 CEST 2013


Module: icinga-doc
Branch: next
Commit: 5fdefea72b242b661fd4286bdec638bd1abd1b52
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=5fdefea72b242b661fd4286bdec638bd1abd1b52

Author: Wolfgang <wnd at gmx.net>
Date:   Tue Apr 30 22:53:25 2013 +0200

docs issue #4021: icinga-web / .htaccess has been removed

---

 de/icinga-web-scratch.xml |   56 +++++--------------------------------------
 en/icinga-web-scratch.xml |   57 +++++---------------------------------------
 2 files changed, 14 insertions(+), 99 deletions(-)

diff --git a/de/icinga-web-scratch.xml b/de/icinga-web-scratch.xml
index d1bb4a2..eb0c438 100644
--- a/de/icinga-web-scratch.xml
+++ b/de/icinga-web-scratch.xml
@@ -537,7 +537,9 @@
           <listitem>
             <para>mod_rewrite, vielleicht müssen Sie einen Verweis erstellen:</para>
 
-            <para><screen> #> ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load</screen></para>
+            <para>
+              <screen> #> ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load</screen>
+            </para>
 
             <para>Bei OpenSuSE und SLES können Sie das Modul mit "a2enmod rewrite" aktivieren. Falls das nicht funktioniert, gibt es in der
             Datei <filename>/etc/sysconfig/apache2</filename> die Zeile "APACHE_MODULES=...", der das Modul "rewrite" hinzugefügt werden
@@ -548,54 +550,10 @@
             <para>Bei RHEL/Fedora/CentOS ist die Unterstützung bereits im httpd enthalten.</para>
           </listitem>
 
-          <listitem>
-            <para>Über htaccess aktivierte Einstellungen</para>
-
-            <para>Editieren Sie die <filename>.htaccess</filename> unter <filename>/usr/local/icinga-web/pub</filename> und ändern Sie die
-            RewriteBase (ab Zeile 14): <programlisting> DirectoryIndex index.php
-
- Options -MultiViews -Indexes +FollowSymLinks
- Order allow,deny
- Allow from all
-
- <IfModule mod_rewrite.c>
-    RewriteEngine On
-
-    # This depends on your path
-    # on independent hosts the base is '/'
-    RewriteBase /icinga-web/
-
-        # If the requested URL does not exist (it's likely an agavi route),
-        # pass it as path info to index.php, the Agavi dispatch script.
-        RewriteRule ^$ index.php?/ [QSA,L]
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteRule (.*) index.php?/$1 [QSA,L]
- </IfModule>
-
- <IfModule mod_deflate.c>
-        SetOutputFilter DEFLATE
-
-        BrowserMatch ^Mozilla/4 gzip-only-text/html
-        BrowserMatch ^Mozilla/4\.0[678] no-gzip
-
-        BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-        BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html
-
-        Header append Vary User-Agent env=!dont-vary
- </IfModule>
-
- <IfDefine APACHE2>
-        AcceptPathInf  On
- </IfDefine>
-
- #<IfModule mod_auth_basic.c>
- #       AuthType Basic
- #       AuthName "My http basic auth realm"
- #       AuthUserFile /path/to/my/htusers
- #       require valid-user
- #</IfModule></programlisting></para>
-          </listitem>
+          <note>
+            <para>In 1.9 wurde die Datei <filename>.htaccess</filename> entfernt und die Optionen sind nun in der Apache-Konfiguration zu
+            finden.</para>
+          </note>
         </itemizedlist>
 
         <para>Bitte wechseln Sie in das Konfigurationsverzeichnis Ihres Webservers. Überprüfen Sie, ob die mit <emphasis role="bold">make
diff --git a/en/icinga-web-scratch.xml b/en/icinga-web-scratch.xml
index 9bf1376..94bf3c5 100644
--- a/en/icinga-web-scratch.xml
+++ b/en/icinga-web-scratch.xml
@@ -539,7 +539,9 @@
           <listitem>
             <para>mod_rewrite enabled, maybe you have to create a link:</para>
 
-            <para><screen> #> ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load</screen></para>
+            <para>
+              <screen> #> ln -s /etc/apache2/mods-available/rewrite.load /etc/apache2/mods-enabled/rewrite.load</screen>
+            </para>
 
             <para>Using OpenSuSE or SLES you can use "a2enmod rewrite" to activate the module. If that doesn't work you have to edit the
             file "<filename>/etc/sysconfig/apache2</filename>". The module "rewrite" has to be appended to the line
@@ -550,55 +552,10 @@
             <para>The httpd of RHEL / Fedora / CentOS already supports rewriting so you don't have to change anything in this regard.</para>
           </listitem>
 
-          <listitem>
-            <para>Any htaccess enabled alias settings</para>
-
-            <para>Edit your <filename>.htaccess</filename> in <filename>/usr/local/icinga-web/pub</filename>:</para>
-
-            <para>At line 14, change the RewriteBase direction to suit to your needs:<programlisting> DirectoryIndex index.php
-
- Options -MultiViews -Indexes +FollowSymLinks
- Order allow,deny
- Allow from all
-
- <IfModule mod_rewrite.c>
-    RewriteEngine On
-
-    # This depends on your path
-    # on independent hosts the base is '/'
-    RewriteBase /icinga-web/
-
-        # If the requested URL does not exist (it's likely an agavi route),
-        # pass it as path info to index.php, the Agavi dispatch script.
-        RewriteRule ^$ index.php?/ [QSA,L]
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteCond %{REQUEST_FILENAME} !-d
-        RewriteRule (.*) index.php?/$1 [QSA,L]
- </IfModule>
-
- <IfModule mod_deflate.c>
-        SetOutputFilter DEFLATE
-
-        BrowserMatch ^Mozilla/4 gzip-only-text/html
-        BrowserMatch ^Mozilla/4\.0[678] no-gzip
-
-        BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-        BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html
-
-        Header append Vary User-Agent env=!dont-vary
- </IfModule>
-
- <IfDefine APACHE2>
-        AcceptPathInf  On
- </IfDefine>
-
- #<IfModule mod_auth_basic.c>
- #       AuthType Basic
- #       AuthName "My http basic auth realm"
- #       AuthUserFile /path/to/my/htusers
- #       require valid-user
- #</IfModule></programlisting></para>
-          </listitem>
+          <note>
+            <para>The file <filename>.htaccess</filename> has been removed in 1.9 and the options have been moved to the Apache
+            configuration file.</para>
+          </note>
         </itemizedlist>
 
         <para>Go to the webservers configuration directory. Look if the created config by <emphasis role="bold">make





More information about the icinga-checkins mailing list