X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=ccbb11309e5018c9d55f2195e0b5dabca5e12bf4;hp=1220e481a8f0afd81ef354dbc59ba2c4910bbac5;hb=HEAD;hpb=1b957cac35917fc7f3254b3543bd0113ac4c1e0c diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf index 1220e48..ccbb113 100644 --- a/p.vbz.ffzg.hr.conf +++ b/p.vbz.ffzg.hr.conf @@ -165,75 +165,27 @@ FilterChain NEWPATHS2 CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - Include /srv/via-proxy/ssl.conf - - ServerName onlinelibrary.wiley.com.p.vbz.ffzg.hr - SSLProxyEngine on - ProxyAddHeaders Off - - ProxyPass / https://onlinelibrary.wiley.com/ - ProxyPassReverse / https://onlinelibrary.wiley.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://anthrosource.onlinelibrary.wiley.com" "https://anthrosource.onlinelibrary.wiley.com.p.vbz.ffzg.hr" - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - - Include /srv/via-proxy/ssl.conf - - ServerName anthrosource.onlinelibrary.wiley.com.p.vbz.ffzg.hr - SSLProxyEngine on - ProxyAddHeaders Off - - ProxyPass / https://anthrosource.onlinelibrary.wiley.com/ - ProxyPassReverse / https://anthrosource.onlinelibrary.wiley.com/ - - Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3" - Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1" - - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - - - Include /srv/via-proxy/ssl.conf - - ServerName journals.sagepub.com.p.vbz.ffzg.hr - - ProxyAddHeaders Off - - ProxyPass / http://journals.sagepub.com/ - ProxyPassReverse / http://journals.sagepub.com/ - - Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3" - Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1" - - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - 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 +202,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|" @@ -684,76 +635,6 @@ FilterChain NEWPATHS2 CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - Include /srv/via-proxy/ssl.conf - - ServerName www.scopus.com.p.vbz.ffzg.hr - - SSLProxyEngine on - ProxyAddHeaders Off - ProxyPass / https://www.scopus.com/ - ProxyPassReverse / https://www.scopus.com/ - - 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|https://www.scopus.com|https://www.scopus.com.p.vbz.ffzg.hr|" - FilterDeclare NEWPATHS - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/css|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|" - FilterChain NEWPATHS - - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - - - Include /srv/via-proxy/ssl.conf - - 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|//(.*)\.bmj\.com/|//journals.bmj.com.p.vbz.ffzg.hr/_rewrite_/$1/_path_/|" - FilterDeclare NEWPATHS - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/css|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|" - FilterChain NEWPATHS - - # fix all other plain http resources - RewriteEngine on - RewriteRule /_rewrite_/(.*)/_path_/(.*) http://$1.bmj.com/$2 [P,L] - - #SSLProxyEngine on - ProxyAddHeaders Off - ProxyPass / http://journals.bmj.com/ - ProxyPassReverse / http://journals.bmj.com/ - - Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3" - Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1" - - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - - - - Include /srv/via-proxy/ssl.conf - - ServerName journals.bmj.com.p.vbz.ffzg.hr - - #SSLProxyEngine on - ProxyAddHeaders Off - ProxyPass / http://journals.bmj.com/ - ProxyPassReverse / http://journals.bmj.com/ - - Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3" - Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1" - - CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined - Include /srv/via-proxy/ssl.conf @@ -761,66 +642,30 @@ FilterChain NEWPATHS2 ServerName ieeexplore.ieee.org.p.vbz.ffzg.hr RequestHeader unset Accept-Encoding - Substitute "s|http://staticieeexplore.ieee.org/|https://ieeexplore.ieee.org.p.vbz.ffzg.hr/_static_/|n" + Substitute "s|https://staticieeexplore.ieee.org/|https://ieeexplore.ieee.org.p.vbz.ffzg.hr/_static_/|n" FilterDeclare NEWPATHS FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|" FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/css|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|" - FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|" + # AH01328: Line too long + #FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|" + #FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|" FilterChain NEWPATHS ProxyAddHeaders Off - ProxyPass /_static_/ http://staticieeexplore.ieee.org/ - ProxyPassReverse /_static_/ http://staticieeexplore.ieee.org/ + ProxyPass /_static_/ https://staticieeexplore.ieee.org/ + ProxyPassReverse /_static_/ https://staticieeexplore.ieee.org/ # IEEE Xplore is transitioning to HTTPS on 9 April 2018. - #SSLProxyEngine on - ProxyPass / http://ieeexplore.ieee.org/ - ProxyPassReverse / http://ieeexplore.ieee.org/ - - Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3" - Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1" - - 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/ + ProxyPass / https://ieeexplore.ieee.org/ + ProxyPassReverse / https://ieeexplore.ieee.org/ 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 +736,7 @@ FilterChain NEWPATHS2 CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined +IncludeOptional /srv/via-proxy/providers/*.conf