X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=d34c5793ed7f020ad6ff3a23816418e07115d891;hp=bf39c1b75af6422b6eeb84043226a8cc6f34e8fc;hb=b421f75fb9029c9a6191ad585ac9a15516603f3b;hpb=c4a425e5993e999c602c16498f876bd51d0816a3

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index bf39c1b..d34c579 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -6,10 +6,44 @@
 	ServerName muse.jhu.edu.p.vbz.ffzg.hr
 	SSLProxyEngine on
 	ProxyAddHeaders Off
+
 	ProxyPass / https://muse.jhu.edu/
 	ProxyPassReverse / https://muse.jhu.edu/
 	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://muse.jhu.edu/|https://muse.jhu.edu.p.vbz.ffzg.hr/|"
+	Substitute "s|https://about.muse.jhu.edu/|https://about.muse.jhu.edu.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
+</VirtualHost>
+
+<VirtualHost *:443>
+	Include /srv/via-proxy/ssl.conf
+	ServerName about.muse.jhu.edu.p.vbz.ffzg.hr
+	SSLProxyEngine on
+	ProxyAddHeaders Off
+
+	ProxyPass / https://about.muse.jhu.edu/
+	ProxyPassReverse / https://about.muse.jhu.edu/
+	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://muse.jhu.edu/|https://muse.jhu.edu.p.vbz.ffzg.hr/|"
+	Substitute "s|https://about.muse.jhu.edu/|https://about.muse.jhu.edu.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
 </VirtualHost>
 
@@ -131,75 +165,27 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
-<VirtualHost *:443>
-	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
-</VirtualHost>
-<VirtualHost *:443>
-	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
-</VirtualHost>
-
-<VirtualHost *:443>
-	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
-</VirtualHost>
 
 <VirtualHost *:443>
 	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|"
@@ -216,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|"
@@ -650,39 +635,14 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
-<VirtualHost *:443>
-	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
-</VirtualHost>
 
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
 
-	ServerName journals.bmj.com.p.vbz.ffzg.hr
+	ServerName ieeexplore.ieee.org.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_/|"
+	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|"
@@ -690,30 +650,14 @@ FilterChain NEWPATHS2
 	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
-</VirtualHost>
-
-<VirtualHost *:443>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName journals.bmj.com.p.vbz.ffzg.hr
+	ProxyPass        /_static_/ https://staticieeexplore.ieee.org/
+	ProxyPassReverse /_static_/ https://staticieeexplore.ieee.org/
 
-	#SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / http://journals.bmj.com/
-	ProxyPassReverse / http://journals.bmj.com/
+	# IEEE Xplore is transitioning to HTTPS on 9 April 2018.
+	SSLProxyEngine on
+	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"
@@ -721,28 +665,16 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
+
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
 
-	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"
-	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
+	ServerName search.alexanderstreet.com.p.vbz.ffzg.hr
 
+	SSLProxyEngine on
 	ProxyAddHeaders Off
-	ProxyPass        /_static_/ http://staticieeexplore.ieee.org/
-	ProxyPassReverse /_static_/ http://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/
+	ProxyPass        / https://search.alexanderstreet.com/
+	ProxyPassReverse / https://search.alexanderstreet.com/
 
 	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
@@ -753,42 +685,57 @@ FilterChain NEWPATHS2
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
 
-	ServerName jcr.incites.thomsonreuters.com.p.vbz.ffzg.hr
+	ServerName pubs.asha.org.p.vbz.ffzg.hr
 
 	SSLProxyEngine on
 	ProxyAddHeaders Off
-	ProxyPass        / https://jcr.incites.thomsonreuters.com/
-	ProxyPassReverse / https://jcr.incites.thomsonreuters.com/
+	ProxyPass        / https://pubs.asha.org/
+	ProxyPassReverse / https://pubs.asha.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"
+	Header edit* Location "https://leader.pubs.asha.org/" "https://leader.pubs.asha.org.p.vbz.ffzg.hr/"
 
+	RequestHeader unset Accept-Encoding
+	Substitute "s|https://pubs.asha.org|https://pubs.asha.org.p.vbz.ffzg.hr|"
+	Substitute "s|https://leader.pubs.asha.org|https://leader.pubs.asha.org.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
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
 
-	ServerName login.incites.thomsonreuters.com.p.vbz.ffzg.hr
+	ServerName leader.pubs.asha.org.p.vbz.ffzg.hr
 
 	SSLProxyEngine on
 	ProxyAddHeaders Off
-	ProxyPass        / https://login.incites.thomsonreuters.com/
-	ProxyPassReverse / https://login.incites.thomsonreuters.com/
+	ProxyPass        / https://leader.pubs.asha.org/
+	ProxyPassReverse / https://leader.pubs.asha.org/
 
 	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"
+	RequestHeader unset Accept-Encoding
+	Substitute "s|https://pubs.asha.org|https://pubs.asha.org.p.vbz.ffzg.hr|"
+	Substitute "s|https://leader.pubs.asha.org|https://leader.pubs.asha.org.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
 </VirtualHost>
 
-
+IncludeOptional /srv/via-proxy/providers/*.conf