move rsc to https

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

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 2952322..73b9b40 100644 (file)
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -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|"