redirect ext-all.js to original site since it breaks over proxy

[via-proxy] / p.vbz.ffzg.hr.conf

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 73b9b40..ede06fb 100644 (file)
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -713,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|"
@@ -724,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"
@@ -782,43 +782,6 @@ FilterChain NEWPATHS2
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
-<VirtualHost *:443>
-       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
-</VirtualHost>
-<VirtualHost *:443>
-       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
-</VirtualHost>
 
 <VirtualHost *:443>
        Include /srv/via-proxy/ssl.conf
@@ -889,6 +852,7 @@ FilterChain NEWPATHS2
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
+IncludeOptional /srv/via-proxy/providers/*.conf