[Inteproxy-commits] r216 - in trunk: . apache

Wed Dec 2 14:38:37 CET 2009

Author: sholl
Date: 2009-12-02 14:38:36 +0100 (Wed, 02 Dec 2009)
New Revision: 216

Added:
   trunk/inteproxy.cfg
Removed:
   trunk/demo-credentials.cfg
   trunk/demo.cfg
Modified:
   trunk/ChangeLog
   trunk/apache/README.txt
Log:
* demo.cfg: renamed to inteproxy.cfg, since this is the
default-config file.
* inteproxy.cfg: New. renamed from demo.cfg. Added another secured
URL to show that the list must be indented to work properly.
* demo-credentials.cfg: removed from the repository, because it is
not needed anymore since rev206.
* apache/README.txt: updated the usage of create-rewrite-rules.py.



Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-11-26 21:30:03 UTC (rev 215)
+++ trunk/ChangeLog	2009-12-02 13:38:36 UTC (rev 216)
@@ -1,3 +1,13 @@
+2009-12-02  Stephan Holl  <stephan.holl at intevation.de>
+
+	* demo.cfg: renamed to inteproxy.cfg, since this is the
+	default-config file.
+	* inteproxy.cfg: New. renamed from demo.cfg. Added another secured
+	URL to show that the list must be indented to work properly.
+	* demo-credentials.cfg: removed from the repository, because it is
+	not needed anymore since rev206.
+	* apache/README.txt: updated the usage of create-rewrite-rules.py.
+
 2009-11-26  Bernhard Herzog  <bh at intevation.de>
 
 	The regular expressions used when looking for URLs to rewrite when

Modified: trunk/apache/README.txt
===================================================================
--- trunk/apache/README.txt	2009-11-26 21:30:03 UTC (rev 215)
+++ trunk/apache/README.txt	2009-12-02 13:38:36 UTC (rev 216)
@@ -30,12 +30,10 @@
 
 2. Convert InteProxy configuration.
 
-  ../create-rewrite-rules.py --config-file=... --credentials-file=... \
-      -o conf/inteproxy-rewrite.conf
+  ../create-rewrite-rules.py --config-file=... -o conf/inteproxy-rewrite.conf
 
-create-rewrite-rules.py reads the InteProxy config file and the
-credentials configuration file and writes Apache RewriteRule directives
-to the output file.
+create-rewrite-rules.py reads the InteProxy config file and writes Apache
+RewriteRule directives to the output file.
 
 
 Starting Apache

Deleted: trunk/demo-credentials.cfg
===================================================================
--- trunk/demo-credentials.cfg	2009-11-26 21:30:03 UTC (rev 215)
+++ trunk/demo-credentials.cfg	2009-12-02 13:38:36 UTC (rev 216)
@@ -1,12 +0,0 @@
-# Example credentials configuration for InteProxy.  
-#
-# There's one section for each server.  The host and path entries should
-# match an entry in the inteproxy configuration file inteproxy.cfg.  To
-# avoid confusion, it's best to use the same section names as in
-# inteproxy.cfg, although that's not necessary.
-
-[example.com]
-host=example.com
-path=/cgi-bin/wms
-username=john
-password=1234

Deleted: trunk/demo.cfg
===================================================================
--- trunk/demo.cfg	2009-11-26 21:30:03 UTC (rev 215)
+++ trunk/demo.cfg	2009-12-02 13:38:36 UTC (rev 216)
@@ -1,131 +0,0 @@
-# Demo configuration for InteProxy.
-#
-# This file defines how different remote servers are to be accessed.
-# 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
-# the suggestion to use the full domain name.
-#
-# InteProxy-related configuration-entries follow
-# !! IMPORTANT:
-# !! If you need upstream proxy-authentification, please uncomment the
-# !! following entries [inteproxy] and [http_proxy_authentification] and
-# !! adopt them with your credentials!
-
-# Authentification against upstream proxy-servers
-# [inteproxy]
-# https_proxy=http_proxy_authentification
-# http_proxy=http_proxy_authentification
-# 
-# [http_proxy_authentification]
-# host=upstream.proxy.url.com
-# port=8080
-# username=john
-# password=secret
-
-# 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
-#
-# 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
-#
-# 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
-path=/mapgate/farbe
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/farbe_trans]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/farbe_trans
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/farbe_dyn]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/farbe_dyn
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/farbe_trans_dyn]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/farbe_trans_dyn
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/grau]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/grau
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/grau_trans]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/grau_trans
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/grau_dyn]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/grau_dyn
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/grau_trans_dyn]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/grau_trans_dyn
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/historisch]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/historisch
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/ak5_einzel]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/ak5_einzel
-class=owsproxy
-
-# Lower Saxony secured WMS-Services
-[www.geobasisdaten.niedersachsen.de/mapgate/ak5_einzel_grau]
-host=www.geobasisdaten.niedersachsen.de
-path=/mapgate/ak5_einzel_grau
-class=owsproxy
-

Copied: trunk/inteproxy.cfg (from rev 215, trunk/demo.cfg)
===================================================================
--- trunk/demo.cfg	2009-11-26 21:30:03 UTC (rev 215)
+++ trunk/inteproxy.cfg	2009-12-02 13:38:36 UTC (rev 216)
@@ -0,0 +1,132 @@
+# Demo configuration for InteProxy.
+#
+# This file defines how different remote servers are to be accessed.
+# 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
+# the suggestion to use the full domain name.
+#
+# InteProxy-related configuration-entries follow
+# !! IMPORTANT:
+# !! If you need upstream proxy-authentification, please uncomment the
+# !! following entries [inteproxy] and [http_proxy_authentification] and
+# !! adopt them with your credentials!
+
+# Authentification against upstream proxy-servers
+# [inteproxy]
+# https_proxy=http_proxy_authentification
+# http_proxy=http_proxy_authentification
+# 
+# [http_proxy_authentification]
+# host=upstream.proxy.url.com
+# port=8080
+# username=john
+# password=secret
+
+# 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
+#
+# 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
+#
+# 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
+     owsproxy://USERNAME:PASSWORT@mysecure.server.de/mapgate/*
+
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/farbe]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/farbe
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/farbe_trans]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/farbe_trans
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/farbe_dyn]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/farbe_dyn
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/farbe_trans_dyn]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/farbe_trans_dyn
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/grau]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/grau
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/grau_trans]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/grau_trans
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/grau_dyn]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/grau_dyn
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/grau_trans_dyn]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/grau_trans_dyn
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/historisch]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/historisch
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/ak5_einzel]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/ak5_einzel
+class=owsproxy
+
+# Lower Saxony secured WMS-Services
+[www.geobasisdaten.niedersachsen.de/mapgate/ak5_einzel_grau]
+host=www.geobasisdaten.niedersachsen.de
+path=/mapgate/ak5_einzel_grau
+class=owsproxy
+


Property changes on: trunk/inteproxy.cfg
___________________________________________________________________
Name: svn:mergeinfo
   + 

