[Inteproxy-commits] r315 - in trunk: . server/conf

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2011-06-16 13:46:43 +0200 (Thu, 16 Jun 2011)
New Revision: 315

Modified:
   trunk/ChangeLog
   trunk/server/conf/inteproxy-rewrite.conf
Log:
Adjusted inteproxy-rewrite.conf. Harmonization of the example inteproxy-rewrite.conf and the output of create-rewrite-rules.py.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-06-16 08:01:35 UTC (rev 314)
+++ trunk/ChangeLog	2011-06-16 11:46:43 UTC (rev 315)
@@ -1,5 +1,11 @@
 2011-06-16  Bjoern Schilberg <bjoern.schilberg at intevation.de>
 
+	* M server/conf/inteproxy-rewrite.conf:
+	  Adjusted inteproxy-rewrite.conf. Harmonization of the example and the
+	  output of create-rewrite-rules.py.
+
+2011-06-16  Bjoern Schilberg <bjoern.schilberg at intevation.de>
+
 	* M server/conf/inteproxy.conf,
 	  M server/conf/inteproxy-WindowsServer2003.conf:
 	  Added ProxyRemote directive. 

Modified: trunk/server/conf/inteproxy-rewrite.conf
===================================================================
--- trunk/server/conf/inteproxy-rewrite.conf	2011-06-16 08:01:35 UTC (rev 314)
+++ trunk/server/conf/inteproxy-rewrite.conf	2011-06-16 11:46:43 UTC (rev 315)
@@ -1,3 +1,3 @@
 RewriteRule ^/inteproxy\-demo\.intevation\.org\/cgi\-bin\/frida\-wms$ https:/$0?user=meier&password=meier [QSA,P]
 RewriteRule ^/www\.geobasisdaten\.niedersachsen\.de\/mapgate\/.*$ https:/$0?user=USERNAME&password=PASSWORT [QSA,P]
-Substitute s!https?://(inteproxy\055demo\.intevation\.org\/cgi\055bin\/frida\055wms|www\.geobasisdaten\.niedersachsen\.de\/mapgate\/)!http://SERVERNAME:64609/$1!
+Substitute s!https?://(inteproxy\-demo\.intevation\.org\/cgi\-bin\/frida\-wms|www\.geobasisdaten\.niedersachsen\.de\/mapgate\/[^"]*)!http://SERVERNAME:64609/$1!