X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=73b9b4038c864cc1c82d4715c9de2b130912c580;hp=1220e481a8f0afd81ef354dbc59ba2c4910bbac5;hb=054fe104b6a1e1247e42b0cfe91c40a3a2603d77;hpb=1b957cac35917fc7f3254b3543bd0113ac4c1e0c

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 1220e48..73b9b40 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|"
@@ -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"