[Inteproxy-commits] r371 - trunk/server/conf
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Thu Nov 12 21:51:17 CET 2015
Author: bjoern
Date: 2015-11-12 21:51:17 +0100 (Thu, 12 Nov 2015)
New Revision: 371
Added:
trunk/server/conf/inteproxy-WindowsServer.conf
trunk/server/conf/platform-WindowsServer.conf
Removed:
trunk/server/conf/inteproxy-WindowsServer2003.conf
trunk/server/conf/platform-WindowsServer2003.conf
Modified:
trunk/server/conf/inteproxy-rewrite.conf
trunk/server/conf/inteproxy.conf
trunk/server/conf/platform-debian.conf
trunk/server/conf/platform-suse.conf
Log:
Updated inteproxy server confs for version 1.0.5.
Added: trunk/server/conf/inteproxy-WindowsServer.conf
===================================================================
--- trunk/server/conf/inteproxy-WindowsServer.conf (rev 0)
+++ trunk/server/conf/inteproxy-WindowsServer.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -0,0 +1,80 @@
+<VirtualHost *:64609>
+ServerAdmin admin at server.de
+
+DocumentRoot "conf/InteProxy-SERVER-1.0.5/server"
+
+
+TransferLog "conf/InteProxy-SERVER-1.0.5/server/logs/access_log"
+ErrorLog "conf/InteProxy-SERVER-1.0.5/server/logs/error_log"
+
+# Required! Load required modules!
+# To load the necessary Apache modules remove the comment
+# before the include line that corresponds to your distribution.
+
+Include "conf/InteProxy-SERVER-1.0.5/server/conf/platform-WindowsServer.conf"
+
+
+# Intranet Proxy
+ProxyRemote * http://intranet.proxy:8080
+
+
+# Using a high trace log level for mod_rewrite will slow down your Apache HTTP
+# Server dramatically! Use a log level higher than trace2 only for debugging!
+# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#Logging
+
+LogLevel alert filter:alert rewrite:alert
+
+# To get just the mod_rewrite-specific (Apache 2.2) log messages, pipe the log
+# file through grep:
+#
+# tail -f error_log|fgrep '[rewrite:'
+
+
+RewriteEngine On
+
+
+# Define filter chain to rewrite URLs in WMS capabilities responses.
+# WMS capabilities responses have the content type
+# application/vnd.ogc.wms_xml. The slash in the content type value has
+# to be expressed with the octal escape \057 because the slash has to be
+# used as the delimeter of the regular expression
+
+
+
+
+FilterProvider gzinflate INFLATE "%{resp:Content-Encoding} =~ /gzip/"
+FilterProvider fixurls SUBSTITUTE "%{CONTENT_TYPE} =~ /(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
+FilterProvider gzdeflate DEFLATE "%{CONTENT_TYPE} =~ /(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
+FilterChain +gzinflate +fixurls +gzdeflate
+
+
+# conf/inteproxy-rewrite.conf has to be generated if it doesn't exist
+# yet (see README.txt). It contains the RewriteRules for the actual
+# InteProxy functionality.
+Include "conf/InteProxy-SERVER-1.0.5/server/conf/inteproxy-rewrite.conf"
+
+# Deny all requests that have not been rewritten to refer to another
+# host.
+<Directory />
+Require all denied
+</Directory>
+
+
+
+## SSL configuration.
+## SSLProxyEngine must be on so that Apache can make
+# https connections to other hosts.
+SSLProxyEngine on
+
+## SSLMutex cannot occur within <VirtualHost> section
+## und bereits in conf/ssl.conf konfiguriert
+#SSLMutex default
+SSLProtocol all -SSLv2
+SSLCipherSuite HIGH:MEDIUM:!ADH
+
+## SSLRandomSeed cannot occur within <VirtualHost> section
+## und bereits in conf/ssl.conf konfiguriert
+#SSLRandomSeed startup builtin
+#SSLRandomSeed connect builtin
+
+</VirtualHost>
Deleted: trunk/server/conf/inteproxy-WindowsServer2003.conf
===================================================================
--- trunk/server/conf/inteproxy-WindowsServer2003.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/inteproxy-WindowsServer2003.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -1,68 +0,0 @@
-<VirtualHost *:64609>
-ServerAdmin admin at server.de
-
-DocumentRoot "conf/InteProxy-SERVER-1.0.4/server"
-
-
-TransferLog "conf/InteProxy-SERVER-1.0.4/server/logs/access_log"
-
-# Required! Load required modules!
-# To load the necessary Apache modules remove the comment
-# before the include line that corresponds to your distribution.
-
-Include "conf/InteProxy-SERVER-1.0.4/server/conf/platform-WindowsServer2003.conf"
-
-
-# Intranet Proxy
-ProxyRemote * http://intranet.proxy:8080
-
-
-RewriteEngine On
-# RewriteLogLevel 0
-RewriteLog "conf/InteProxy-SERVER-1.0.4/server/logs/rewrite.log"
-
-
-# Define filter chain to rewrite URLs in WMS capabilities responses.
-# WMS capabilities responses have the content type
-# application/vnd.ogc.wms_xml. The slash in the content type value has
-# to be expressed with the octal escape \057 because the slash has to be
-# used as the delimeter of the regular expression
-
-FilterProvider gzinflate INFLATE resp=Content-Encoding $gzip
-FilterProvider fixurls SUBSTITUTE Content-Type "/(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
-FilterProvider gzdeflate DEFLATE Content-Type "/(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
-FilterChain +gzinflate +fixurls +gzdeflate
-
-
-
-# conf/inteproxy-rewrite.conf has to be generated if it doesn't exist
-# yet (see README.txt). It contains the RewriteRules for the actual
-# InteProxy functionality.
-Include "conf/InteProxy-SERVER-1.0.4/server/conf/inteproxy-rewrite.conf"
-
-# Deny all requests that have not been rewritten to refer to another
-# host.
-<Directory />
- Order Deny,Allow
- Deny from All
-</Directory>
-
-
-
-## SSL configuration.
-## SSLProxyEngine must be on so that Apache can make
-# https connections to other hosts.
-SSLProxyEngine on
-
-## SSLMutex cannot occur within <VirtualHost> section
-## und bereits in conf/ssl.conf konfiguriert
-#SSLMutex default
-SSLProtocol all -SSLv2
-SSLCipherSuite HIGH:MEDIUM:!ADH
-
-## SSLRandomSeed cannot occur within <VirtualHost> section
-## und bereits in conf/ssl.conf konfiguriert
-#SSLRandomSeed startup builtin
-#SSLRandomSeed connect builtin
-
-</VirtualHost>
Modified: trunk/server/conf/inteproxy-rewrite.conf
===================================================================
--- trunk/server/conf/inteproxy-rewrite.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/inteproxy-rewrite.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -1,3 +1,2 @@
-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\-demo\.intevation\.org\/cgi\-bin\/frida\-wms|www\.geobasisdaten\.niedersachsen\.de\/mapgate\/[^"]*)!http://SERVERNAME:64609/$1!
+Substitute s!https?://(www\.geobasisdaten\.niedersachsen\.de\/mapgate\/[^"]*)!http://SERVERNAME:64609/$1!
Modified: trunk/server/conf/inteproxy.conf
===================================================================
--- trunk/server/conf/inteproxy.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/inteproxy.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -1,26 +1,35 @@
<VirtualHost *:64609>
ServerAdmin admin at server.de
-DocumentRoot /opt/InteProxy-SERVER-1.0.4/server
+DocumentRoot /opt/InteProxy-SERVER-1.0.5/server
-TransferLog /opt/InteProxy-SERVER-1.0.4/server/logs/access_log
+TransferLog /opt/InteProxy-SERVER-1.0.5/server/logs/access_log
+ErrorLog /opt/InteProxy-SERVER-1.0.5/server/logs/error_log
# Required! Load required modules!
# To load the necessary Apache modules remove the comment
# before the include line that corresponds to your distribution.
-#Include /opt/InteProxy-SERVER-1.0.4/server/conf/platform-suse.conf
-#Include /opt/InteProxy-SERVER-1.0.4/server/conf/platform-debian.conf
+#Include /opt/InteProxy-SERVER-1.0.5/server/conf/platform-suse.conf
+#Include /opt/InteProxy-SERVER-1.0.5/server/conf/platform-debian.conf
# Intranet Proxy
ProxyRemote * http://intranet.proxy:8080
+# Using a high trace log level for mod_rewrite will slow down your Apache HTTP
+# Server dramatically! Use a log level higher than trace2 only for debugging!
+# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#Logging
+LogLevel alert filter:alert rewrite:alert
+
+# To get just the mod_rewrite-specific (Apache 2.2) log messages, pipe the log
+# file through grep:
+#
+# tail -f error_log|fgrep '[rewrite:'
+
RewriteEngine On
-# RewriteLogLevel 0
-RewriteLog /opt/InteProxy-SERVER-1.0.4/server/logs/rewrite.log
# Define filter chain to rewrite URLs in WMS capabilities responses.
# WMS capabilities responses have the content type
@@ -28,9 +37,11 @@
# to be expressed with the octal escape \057 because the slash has to be
# used as the delimeter of the regular expression
-FilterProvider gzinflate INFLATE resp=Content-Encoding $gzip
-FilterProvider fixurls SUBSTITUTE Content-Type "/(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
-FilterProvider gzdeflate DEFLATE Content-Type "/(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
+
+
+FilterProvider gzinflate INFLATE "%{resp:Content-Encoding} =~ /gzip/"
+FilterProvider fixurls SUBSTITUTE "%{CONTENT_TYPE} =~ /(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
+FilterProvider gzdeflate DEFLATE "%{CONTENT_TYPE} =~ /(application\057vnd.ogc.wms_xml|application\057xml|application\057vnd.ogc.se_xml|text\057xml|text\057plain|text\057html)($|;)/"
FilterChain +gzinflate +fixurls +gzdeflate
@@ -38,13 +49,12 @@
# conf/inteproxy-rewrite.conf has to be generated if it doesn't exist
# yet (see README.txt). It contains the RewriteRules for the actual
# InteProxy functionality.
-Include /opt/InteProxy-SERVER-1.0.4/server/conf/inteproxy-rewrite.conf
+Include /opt/InteProxy-SERVER-1.0.5/server/conf/inteproxy-rewrite.conf
# Deny all requests that have not been rewritten to refer to another
# host.
<Directory />
- Order Deny,Allow
- Deny from All
+Require all denied
</Directory>
Added: trunk/server/conf/platform-WindowsServer.conf
===================================================================
--- trunk/server/conf/platform-WindowsServer.conf (rev 0)
+++ trunk/server/conf/platform-WindowsServer.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -0,0 +1,32 @@
+## windows server specific configuration
+
+<IfModule !log_config_module>
+LoadModule log_config_module modules/mod_log_config.so
+</IfModule>
+<IfModule !authz_core_module>
+LoadModule authz_core_module modules/mod_authz_core.so
+</IfModule>
+<IfModule !authz_host_module>
+LoadModule authz_host_module modules/mod_authz_host.so
+</IfModule>
+<IfModule !deflate_module>
+LoadModule deflate_module modules/mod_deflate.so
+</IfModule>
+<IfModule !filter_module>
+LoadModule filter_module modules/mod_filter.so
+</IfModule>
+<IfModule !proxy_http_module>
+LoadModule proxy_http_module modules/mod_proxy_http.so
+</IfModule>
+<IfModule !proxy_module>
+LoadModule proxy_module modules/mod_proxy.so
+</IfModule>
+<IfModule !rewrite_module>
+LoadModule rewrite_module modules/mod_rewrite.so
+</IfModule>
+<IfModule !ssl_module>
+LoadModule ssl_module modules/mod_ssl.so
+</IfModule>
+<IfModule !substitute_module>
+LoadModule substitute_module modules/mod_substitute.so
+</IfModule>
Deleted: trunk/server/conf/platform-WindowsServer2003.conf
===================================================================
--- trunk/server/conf/platform-WindowsServer2003.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/platform-WindowsServer2003.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -1,26 +0,0 @@
-## windows 2003 specific configuration
-
-<IfModule !authz_host_module>
-LoadModule authz_host_module modules/mod_authz_host.so
-</IfModule>
-<IfModule !deflate_module>
-LoadModule deflate_module modules/mod_deflate.so
-</IfModule>
-<IfModule !filter_module>
-LoadModule filter_module modules/mod_filter.so
-</IfModule>
-<IfModule !proxy_http_module>
-LoadModule proxy_http_module modules/mod_proxy_http.so
-</IfModule>
-<IfModule !proxy_module>
-LoadModule proxy_module modules/mod_proxy.so
-</IfModule>
-<IfModule !rewrite_module>
-LoadModule rewrite_module modules/mod_rewrite.so
-</IfModule>
-<IfModule !ssl_module>
-LoadModule ssl_module modules/mod_ssl.so
-</IfModule>
-<IfModule !substitute_module>
-LoadModule substitute_module modules/mod_substitute.so
-</IfModule>
Modified: trunk/server/conf/platform-debian.conf
===================================================================
--- trunk/server/conf/platform-debian.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/platform-debian.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -9,12 +9,12 @@
<IfModule !filter_module>
Include /etc/apache2/mods-available/filter.load
</IfModule>
+<IfModule !proxy_module>
+Include /etc/apache2/mods-available/proxy.load
+</IfModule>
<IfModule !proxy_http_module>
Include /etc/apache2/mods-available/proxy_http.load
</IfModule>
-<IfModule !proxy_module>
-Include /etc/apache2/mods-available/proxy.load
-</IfModule>
<IfModule !rewrite_module>
Include /etc/apache2/mods-available/rewrite.load
</IfModule>
Modified: trunk/server/conf/platform-suse.conf
===================================================================
--- trunk/server/conf/platform-suse.conf 2015-11-12 20:50:18 UTC (rev 370)
+++ trunk/server/conf/platform-suse.conf 2015-11-12 20:51:17 UTC (rev 371)
@@ -12,12 +12,12 @@
<IfModule !filter_module>
LoadModule filter_module /usr/lib/apache2-prefork/mod_filter.so
</IfModule>
+<IfModule !proxy_module>
+LoadModule proxy_module /usr/lib/apache2-prefork/mod_proxy.so
+</IfModule>
<IfModule !proxy_http_module>
LoadModule proxy_http_module /usr/lib/apache2-prefork/mod_proxy_http.so
</IfModule>
-<IfModule !proxy_module>
-LoadModule proxy_module /usr/lib/apache2-prefork/mod_proxy.so
-</IfModule>
<IfModule !rewrite_module>
LoadModule rewrite_module /usr/lib/apache2-prefork/mod_rewrite.so
</IfModule>
More information about the Inteproxy-commits
mailing list