X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=p.vbz.ffzg.hr.conf;h=97d579af83a2d7f5ef751f1307403c39b446e158;hb=108b5a05223c48181b03d3bc80bb6a323ac4f28e;hp=ae34ddd192b7df6324bcc8465c03702e5ea655b0;hpb=6b5571fa0db9bdc894cf394192b4acee6074d776;p=via-proxy

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index ae34ddd..97d579a 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -201,11 +201,11 @@ FilterChain NEWPATHS2
 	Include /srv/via-proxy/ssl.conf
 
 	ServerName journals.sagepub.com.p.vbz.ffzg.hr
-
+	SSLProxyEngine on
 	ProxyAddHeaders Off
 
-	ProxyPass        / http://journals.sagepub.com/
-	ProxyPassReverse / http://journals.sagepub.com/
+	ProxyPass        / https://journals.sagepub.com/
+	ProxyPassReverse / https://journals.sagepub.com/
 
 	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
@@ -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"
@@ -761,7 +759,7 @@ 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|"
@@ -770,13 +768,13 @@ FilterChain NEWPATHS2
 	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/
+	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"
@@ -838,6 +836,58 @@ FilterChain NEWPATHS2
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 
+<VirtualHost *:443>
+	Include /srv/via-proxy/ssl.conf
+
+	ServerName pubs.asha.org.p.vbz.ffzg.hr
+
+	SSLProxyEngine on
+	ProxyAddHeaders Off
+	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://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 leader.pubs.asha.org.p.vbz.ffzg.hr
+
+	SSLProxyEngine on
+	ProxyAddHeaders Off
+	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"
+
+	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>