X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=ede06fbe0408573fd064dbd6e7bbf0bf9dd355da;hp=2952322c73927f1c655526ea3c1eae139c381916;hb=79d4d947d0813ed65241e8a690a294e4dd8469bf;hpb=15495df78c92c843a14ff03bf4a6ca469fc679ae
diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 2952322..ede06fb 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -217,23 +217,22 @@ FilterChain NEWPATHS2
Include /srv/via-proxy/ssl.conf
ServerName pubs.rsc.org.p.vbz.ffzg.hr
-
+ SSLProxyEngine on
ProxyAddHeaders Off
- ProxyPass /_rsc-cdn_/ http://www.rsc-cdn.org/
- ProxyPassReverse /_rsc-cdn_/ http://www.rsc-cdn.org/
+ ProxyPass /_rsc-cdn_/ https://www.rsc-cdn.org/
+ ProxyPassReverse /_rsc-cdn_/ https://www.rsc-cdn.org/
- # FIXME -- this doesn't work behind https and include http resources
- ProxyPass / http://pubs.rsc.org/
- ProxyPassReverse / http://pubs.rsc.org/
+ ProxyPass / https://pubs.rsc.org/
+ ProxyPassReverse / https://pubs.rsc.org/
Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
RequestHeader unset Accept-Encoding
- Substitute "s|http://[a-z-]*.rsc-cdn.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/_rsc-cdn_/|"
- Substitute "s|http://www.rsc.org/|https://www.rsc.org.p.vbz.ffzg.hr/|"
- Substitute "s|http://pubs.rsc.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/|"
+ Substitute "s|https://[a-z-]*.rsc-cdn.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/_rsc-cdn_/|"
+ Substitute "s|https://www.rsc.org/|https://www.rsc.org.p.vbz.ffzg.hr/|"
+ Substitute "s|https://pubs.rsc.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/|"
FilterDeclare NEWPATHS
FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
@@ -250,21 +249,20 @@ FilterChain NEWPATHS2
ProxyAddHeaders Off
- ProxyPass /_epi-rsc_/ http://epi-rsc.rsc-cdn.org/
- ProxyPassReverse /_epi-rsc_/ http://epi-rsc.rsc-cdn.org/
+ ProxyPass /_epi-rsc_/ https://epi-rsc.rsc-cdn.org/
+ ProxyPassReverse /_epi-rsc_/ https://epi-rsc.rsc-cdn.org/
- # FIXME -- this doesn't work behind https and include http resources
- ProxyPass / http://www.rsc.org/
- ProxyPassReverse / http://www.rsc.org/
+ ProxyPass / https://www.rsc.org/
+ ProxyPassReverse / https://www.rsc.org/
Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
RequestHeader unset Accept-Encoding
- Substitute "s|http://epi-rsc.rsc-cdn.org/|https://www.rsc.org.p.vbz.ffzg.hr/_epi-rsc_/|"
-# Substitute "s|http://[a-z-]*.rsc-cdn.org/|https://www.rsc.org.p.vbz.ffzg.hr/_rsc-cdn_/|"
- Substitute "s|http://www.rsc.org/|https://www.rsc.org.p.vbz.ffzg.hr/|"
- Substitute "s|http://pubs.rsc.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/|"
+ Substitute "s|https://epi-rsc.rsc-cdn.org/|https://www.rsc.org.p.vbz.ffzg.hr/_epi-rsc_/|"
+# Substitute "s|https://[a-z-]*.rsc-cdn.org/|https://www.rsc.org.p.vbz.ffzg.hr/_rsc-cdn_/|"
+ Substitute "s|https://www.rsc.org/|https://www.rsc.org.p.vbz.ffzg.hr/|"
+ Substitute "s|https://pubs.rsc.org/|https://pubs.rsc.org.p.vbz.ffzg.hr/|"
FilterDeclare NEWPATHS
FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
@@ -715,7 +713,7 @@ FilterChain NEWPATHS2
ServerName journals.bmj.com.p.vbz.ffzg.hr
RequestHeader unset Accept-Encoding
- Substitute "s|(http:)?//(\w+)\.bmj\.com/|https://journals.bmj.com.p.vbz.ffzg.hr/_rewrite_/$2/_path_/|"
+ Substitute "s|(https:)?//(\w+)\.bmj\.com/|https://journals.bmj.com.p.vbz.ffzg.hr/_rewrite_/$2/_path_/|"
# Substitute "s|//(.*)\.bmj\.com/|//journals.bmj.com.p.vbz.ffzg.hr/_rewrite_/$1/_path_/|"
FilterDeclare NEWPATHS
FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
@@ -726,12 +724,12 @@ FilterChain NEWPATHS2
# fix all other plain http resources
RewriteEngine on
- RewriteRule /_rewrite_/(.*)/_path_/(.*) http://$1.bmj.com/$2 [P,L]
+ RewriteRule /_rewrite_/(.*)/_path_/(.*) https://$1.bmj.com/$2 [P,L]
- #SSLProxyEngine on
+ SSLProxyEngine on
ProxyAddHeaders Off
- ProxyPass / http://journals.bmj.com/
- ProxyPassReverse / http://journals.bmj.com/
+ ProxyPass / https://journals.bmj.com/
+ ProxyPassReverse / https://journals.bmj.com/
Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
@@ -784,43 +782,6 @@ FilterChain NEWPATHS2
CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-
- Include /srv/via-proxy/ssl.conf
-
- ServerName jcr.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
- SSLProxyEngine on
- ProxyAddHeaders Off
- ProxyPass / https://jcr.incites.thomsonreuters.com/
- ProxyPassReverse / https://jcr.incites.thomsonreuters.com/
-
- Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
- Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
-
- Header edit* Location "(https://.*.incites.thomsonreuters.com)/?(.*)" "$1.p.vbz.ffzg.hr/$2"
-
-
- CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-
-
- Include /srv/via-proxy/ssl.conf
-
- ServerName login.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
- SSLProxyEngine on
- ProxyAddHeaders Off
- ProxyPass / https://login.incites.thomsonreuters.com/
- ProxyPassReverse / https://login.incites.thomsonreuters.com/
-
- Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
- Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
-
- # they really return http Location header even if everything else was
- # behind https up to that point, AND https works
- Header edit* Location "https?://(.*.incites.thomsonreuters.com)/?(.*)" "https://$1.p.vbz.ffzg.hr/$2"
-
- CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-
Include /srv/via-proxy/ssl.conf
@@ -891,6 +852,7 @@ FilterChain NEWPATHS2
CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+IncludeOptional /srv/via-proxy/providers/*.conf