[Inteproxy-commits] r208 - trunk

[scm-commit@wald.intevation.org]

Author: bh
Date: 2009-09-11 21:52:21 +0200 (Fri, 11 Sep 2009)
New Revision: 208

Modified:
   trunk/ChangeLog
   trunk/demo.cfg
Log:
* demo.cfg: Update the inteproxy part to the new syntax and
document it.  The geobasisdaten.niedersachsen.de URLs are left in
the still supported old format for now.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-09-11 19:36:50 UTC (rev 207)
+++ trunk/ChangeLog	2009-09-11 19:52:21 UTC (rev 208)
@@ -1,5 +1,11 @@
 2009-09-11  Bernhard Herzog  <bh at intevation.de>
 
+	* demo.cfg: Update the inteproxy part to the new syntax and
+	document it.  The geobasisdaten.niedersachsen.de URLs are left in
+	the still supported old format for now.
+
+2009-09-11  Bernhard Herzog  <bh at intevation.de>
+
 	* inteproxy/transcoder.py (IdentityTranscoder.__init__): New
 	parameter and instance variable rule to hold the inteproxy rule
 	for which the transcoder was instantiated.

Modified: trunk/demo.cfg
===================================================================
--- trunk/demo.cfg	2009-09-11 19:36:50 UTC (rev 207)
+++ trunk/demo.cfg	2009-09-11 19:52:21 UTC (rev 208)
@@ -1,12 +1,16 @@
 # Demo configuration for InteProxy.
 #
 # This file defines how different remote servers are to be accessed.
-# There is one section for each remote server.  How the sections are
-# named doesn't really matter but it's a good idea to include the full
-# domain name in the section name.  If you want to access to different
-# servers on the same host, be careful to give both sections different
-# names, by e.g. appending some more information about the server.
+# All servers are specified by URLs in the inteproxy-rules section.
 #
+# For backwards compatibility, an older format is also supported where
+# each server is defined by one section for each remote server.  How the
+# sections are named doesn't really matter but it's a good idea to
+# include the full domain name in the section name.  If you want to
+# access to different servers on the same host, be careful to give both
+# sections different names, by e.g. appending some more information
+# about the server.
+#
 # There might be some additional section with predefined names in the
 # future for other inteproxy settings.  The names for those section will
 # be chosen so as to not interfere with existing section names.  Hence
@@ -29,27 +33,36 @@
 # username=john
 # password=secret
 
-# An example section for the host inteproxy-demo.intevation.org.
-[inteproxy-demo.intevation.org]
-
-# The hostname used in the URLs accessing this server
-host=inteproxy-demo.intevation.org
-
-# The path on the server
-path=/cgi-bin/frida-wms
-
-# the class defines how InteProxy handles the connection to the server.
-# Supported classes are:
+# Main rules section.  The urls setting is a list of urls, one on each
+# line.  From the second line on, the lines have to be indented.
+# Each url is of the form
+#    SCHEME://[USER:PASSWORD@]HOSTNAME[:PORT]/PATH
 #
-#   identity   simply passes the request through.
+# The credentials (USER and PASSWORD) and the port number (PORT) are
+# optional.  If no port is given a default is assumed.
+# SCHEME should be one of the supported schemes:
 #
 #   owsproxy   The remote host is an OWSProxy requiring authentication 
 #              and https
 #
 #   basicauth  HTTP Basic Authorization over https
 #
-class=owsproxy
+# If USERNAME or PASSWORD contain special characters such as '%', ':',
+# '@' and non-ascii characters, these should be escaped as "%" followed
+# by the two hexadecimal digits of the character code.  As a further
+# complication, the percent character is not only special in URLs, but
+# also in the syntax used in this configuration file where a literal
+# percent character has to be quoted by doubling it.  So to encode
+# e.g. percent sign, use "%%25" instead of simply "%".
+#
+# The HOSTNAME and PATH parts of the URL may contain "*" characters as
+# wild-cards.  They will match zero or more occurrances of any
+# character.  However, a wild-card in the hostname will only match in
+# the hostname and a wild-card in the path will only match in the path.
+[inteproxy-rules]
+urls=owsproxy://meier:meier@inteproxy-demo.intevation.org/cgi-bin/frida-wms
 
+
 # Lower Saxony secured WMS-Services
 [www.geobasisdaten.niedersachsen.de/mapgate/farbe]
 host=www.geobasisdaten.niedersachsen.de