Append all rewrite module options to http as well.

parent b2c9cc49
...@@ -60,8 +60,8 @@ BrowserMatch "RealPlayer 4\.0" force-response-1.0 ...@@ -60,8 +60,8 @@ BrowserMatch "RealPlayer 4\.0" force-response-1.0
BrowserMatch "Java/1\.0" force-response-1.0 BrowserMatch "Java/1\.0" force-response-1.0
BrowserMatch "JDK/1\.0" force-response-1.0 BrowserMatch "JDK/1\.0" force-response-1.0
# The following directive disables redirects on non-GET requests for # The following directive disables redirects on non-GET requests for
# a directory that does not include the trailing slash. This fixes a # a directory that does not include the trailing slash. This fixes a
# problem with Microsoft WebFolders which does not appropriately handle # problem with Microsoft WebFolders which does not appropriately handle
# redirects for folders with DAV methods. # redirects for folders with DAV methods.
# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV. # Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
...@@ -84,7 +84,7 @@ MCacheRemovalAlgorithm LRU ...@@ -84,7 +84,7 @@ MCacheRemovalAlgorithm LRU
AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/x-javascript application/javascript
BrowserMatch ^Mozilla/4 gzip-only-text/html BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4\.0[678] no-gzip BrowserMatch ^Mozilla/4\.0[678] no-gzip
BrowserMatch \bMSIE !no-gzip !gzip-only-text/html BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
# Make sure proxies don't deliver the wrong content # Make sure proxies don't deliver the wrong content
Header append Vary User-Agent Header append Vary User-Agent
...@@ -128,16 +128,20 @@ Header append Vary User-Agent ...@@ -128,16 +128,20 @@ Header append Vary User-Agent
ErrorDocument 404 /notfound.html ErrorDocument 404 /notfound.html
</VirtualHost> </VirtualHost>
# Only accept generic (i.e not Zope) backends on http
<VirtualHost *:%(plain_http_port)s> <VirtualHost *:%(plain_http_port)s>
RewriteEngine On
SSLProxyEngine on SSLProxyEngine on
# Rewrite part
ProxyVia On
ProxyPreserveHost On ProxyPreserveHost On
ProxyTimeout 600
RewriteEngine On
# Include configuration file not operated by slapos. This file won't be erased # Include configuration file not operated by slapos. This file won't be erased
# or changed when slapgrid is ran. It can be freely customized by node admin. # or changed when slapgrid is ran. It can be freely customized by node admin.
Include %(custom_apache_virtualhost_conf)s Include %(custom_apache_virtualhost_conf)s
# We accept generic (i.e not Zope) backends on http
RewriteMap apachemapgeneric txt:%(apachemap_path)s RewriteMap apachemapgeneric txt:%(apachemap_path)s
RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >"" RewriteCond ${apachemapgeneric:%%{SERVER_NAME}} >""
RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P] RewriteRule ^/(.*)$ ${apachemapgeneric:%%{SERVER_NAME}}/$1 [L,P]
...@@ -148,6 +152,7 @@ Header append Vary User-Agent ...@@ -148,6 +152,7 @@ Header append Vary User-Agent
RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI} RewriteRule ^/(.*)$ https://%%{SERVER_NAME}%%{REQUEST_URI}
</VirtualHost> </VirtualHost>
# Include configuration file not operated by slapos. This file won't be erased # Include configuration file not operated by slapos. This file won't be erased
# or changed when slapgrid is ran. It can be freely customized by node admin. # or changed when slapgrid is ran. It can be freely customized by node admin.
Include %(custom_apache_conf)s Include %(custom_apache_conf)s
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment