[icinga-checkins] icinga.org: icinga-web/next: Remove/Disable rests of deprecated pub/soap/ interface

git at icinga.org git at icinga.org
Wed Apr 10 23:49:22 CEST 2013


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

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Wed Apr 10 23:44:23 2013 +0200

Remove/Disable rests of deprecated pub/soap/ interface

* Cleaned up icinga-web.conf for Apache
* Disabled definitions in factories, routing and output_types
* Cleaned up stale htaccess file

fixes #3695

---

 app/config/factories.xml.in    |    2 ++
 app/config/output_types.xml    |    8 +++++---
 app/config/routing.modules.xml |    2 ++
 app/config/routing.xml         |    2 ++
 etc/apache2/icinga-web.conf.in |   16 ----------------
 pub/soap/.htaccess             |    3 ---
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/app/config/factories.xml.in b/app/config/factories.xml.in
index d5339e5..9613f54 100644
--- a/app/config/factories.xml.in
+++ b/app/config/factories.xml.in
@@ -90,6 +90,7 @@
         <logger_manager class="AgaviLoggerManager" />
     </ae:configuration>
     
+    <!--
     <ae:configuration context="soap">
         <controller class="AgaviSoapController">
             <ae:parameter name="wsdl">%core.root_dir%/pub/soap/icinga.wsdl</ae:parameter>
@@ -100,6 +101,7 @@
         <user class="AppKitSecurityUser" />
         <logger_manager class="AgaviLoggerManager" />
     </ae:configuration>
+    -->
     
     <!--  Try include the overwriting file -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="@web_conf_dir@/factories.xml#xmlns(ae=http://agavi.org/agavi/config/global/envelope/1.0)xpointer(ae:configurations/node())">
diff --git a/app/config/output_types.xml b/app/config/output_types.xml
index f31bb0c..3feee93 100644
--- a/app/config/output_types.xml
+++ b/app/config/output_types.xml
@@ -191,17 +191,19 @@
         </output_types>
     </ae:configuration>
     
+    <!--
     <ae:configuration context="soap">
         <output_types default="soap">
             <output_type name="soap">
                 <ae:parameter name="http_headers">
-                    <!--  <ae:parameter name="Content-Type">text/x-json; charset=UTF-8</ae:parameter> -->
+                    <!- -  <ae:parameter name="Content-Type">text/x-json; charset=UTF-8</ae:parameter> - ->
                     <ae:parameter name="Content-Type">text/xml; charset=UTF-8</ae:parameter>
                 </ae:parameter>
-            <!-- our common layers that all layouts use. only the content layer in here, and empty, but who knows! -->              
+            <!- - our common layers that all layouts use. only the content layer in here, and empty, but who knows! - ->              
                 
             </output_type>
         </output_types>
     </ae:configuration>
+    -->
     
-</ae:configurations>
\ No newline at end of file
+</ae:configurations>
diff --git a/app/config/routing.modules.xml b/app/config/routing.modules.xml
index 1f8e47a..a9e6ffc 100644
--- a/app/config/routing.modules.xml
+++ b/app/config/routing.modules.xml
@@ -4,8 +4,10 @@
     </configuration>
     <configuration context="console">
     </configuration>
+    <!--
     <configuration context="soap">
     </configuration>
+    -->
     <configuration context="testing">
     </configuration>
 </module_routes>
diff --git a/app/config/routing.xml b/app/config/routing.xml
index 294cd79..679b924 100644
--- a/app/config/routing.xml
+++ b/app/config/routing.xml
@@ -117,6 +117,7 @@
         </routes>
     </ae:configuration>
     
+    <!--
     <ae:configuration context="soap">
         <routes>
             <route name="modules" pattern="^/modules">  
@@ -128,6 +129,7 @@
             <route name="serviceMain" pattern="getIcingaAPI" action="Icinga.ApiSearch" module="Web"/>
         </routes>
     </ae:configuration>
+    -->
     
     <ae:configuration context="testing">
         <routes>
diff --git a/etc/apache2/icinga-web.conf.in b/etc/apache2/icinga-web.conf.in
index 3dfccb9..9a8d3e6 100644
--- a/etc/apache2/icinga-web.conf.in
+++ b/etc/apache2/icinga-web.conf.in
@@ -85,19 +85,3 @@ RedirectMatch "^@web_path@$" @web_path@/
     </IfDefine>
 </Directory>
 
-# rewrite rules for the soap interface
-<Directory "@prefix@/pub/soap/">
-    RewriteEngine On
-
-    # This depends on your path
-    # on independent hosts the base is '/'
-    RewriteBase @web_path@/soap
-
-	# 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?/$0 [QSA,L]
-</Directory>
-
diff --git a/pub/soap/.htaccess b/pub/soap/.htaccess
deleted file mode 100644
index 4671d28..0000000
--- a/pub/soap/.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-# this htaccess file is obsolete and all settings were
-# moved to the apache2 config file.
-# please see etc/apache2/icinga-web.conf* in your tarball





More information about the icinga-checkins mailing list