first pass at fixing proxy-ing behing https

diff --git a/index.html b/index.html
index d06a9cc..2c45b66 100644 (file)
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 <li><a href="https://ovidsp.tx.ovid.com.p.vbz.ffzg.hr/ovidweb.cgi?T=JS&NEWS=n&MODE=ovid&PAGE=main&D=mesz">Ovid mesz</a>
 <li><a href="https://onlinelibrary.wiley.com.p.vbz.ffzg.hr/">Wiley</a>
 <li><a href="https://journals.sagepub.com.p.vbz.ffzg.hr/">Sage</a>
-<li><a href="https://pubs.rsc.org.p.vbz.ffzg.hr/">The Royal Society of Chemistry's</a>
+<li><a href="https://pubs.rsc.org.p.vbz.ffzg.hr/">The Royal Society of Chemistry's</a> FIXME
 <li><a href="https://www.brepolis.net.p.vbz.ffzg.hr">Brepolis</a>
 <li><a href="https://www.cairn.info.p.vbz.ffzg.hr">Cairn</a>
 <li><a href="https://www.degruyter.com.p.vbz.ffzg.hr/browse?type_0=journals">De Gruyter Publishers</a>
@@ -19,13 +19,15 @@
 <li><a href="https://www.nature.com.p.vbz.ffzg.hr">nature</a>
 <li><a href="https://www.palgrave.com.p.vbz.ffzg.hr/gp/journals">palgrave</a>
 <li><a href="https://link.springer.com.p.vbz.ffzg.hr/">springerlink</a>
-<li><a href="https://www.tandfonline.com.p.vbz.ffzg.hr/">tandfonline</a>
+<li><a href="https://www.tandfonline.com.p.vbz.ffzg.hr/">Taylor &amp; Francis Online</a>
 <li><a href="https://www.sciencedirect.com.p.vbz.ffzg.hr/">sciencedirect</a>
 <li><a href="https://www.scopus.com.p.vbz.ffzg.hr/">scopus</a>
-<li><a href="https://journals.bmj.com.p.vbz.ffzg.hr/">bmj</a>
-<li><a href="https://ieeexplore.ieee.org.p.vbz.ffzg.hr/">ieeexplore</a>
+<li><a href="https://journals.bmj.com.p.vbz.ffzg.hr/">bmj</a> FIXME
+<li><a href="https://ieeexplore.ieee.org.p.vbz.ffzg.hr/">ieeexplore</a> FIXME
 
 </ul>
+
+<!--
 <pre>
 http://muse.jhu.edu/journals/index.html
 http://journals.cambridge.org/
@@ -58,4 +60,5 @@ http://journals.bmj.com/
 
 http://ieeexplore.ieee.org/
 </pre>
+-->
 

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index c16cea3..3637ad3 100644 (file)
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -131,10 +131,10 @@ FilterChain NEWPATHS2
        Include /srv/via-proxy/ssl.conf
 
        ServerName onlinelibrary.wiley.com.p.vbz.ffzg.hr
-#      SSLProxyEngine on
+       SSLProxyEngine on
 
-       ProxyPass        / http://onlinelibrary.wiley.com/
-       ProxyPassReverse / http://onlinelibrary.wiley.com/
+       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"
@@ -161,6 +161,7 @@ FilterChain NEWPATHS2
 
        ServerName pubs.rsc.org.p.vbz.ffzg.hr
 
+       # FIXME -- this doesn't work behind https!
        ProxyPass        / http://pubs.rsc.org/
        ProxyPassReverse / http://pubs.rsc.org/
 
@@ -184,7 +185,7 @@ FilterChain NEWPATHS2
 
        RequestHeader unset Accept-Encoding
 
-Substitute "s|http://apps.brepolis.net/|http://apps.brepolis.net.p.vbz.ffzg.hr/|n"
+Substitute "s|http://apps.brepolis.net/|https://apps.brepolis.net.p.vbz.ffzg.hr/|n"
 FilterDeclare NEWPATHS2
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
@@ -207,7 +208,7 @@ FilterChain NEWPATHS2
 
        RequestHeader unset Accept-Encoding
 
-Substitute "s|http://apps.brepolis.net/|http://apps.brepolis.net.p.vbz.ffzg.hr/|n"
+Substitute "s|http://apps.brepolis.net/|https://apps.brepolis.net.p.vbz.ffzg.hr/|n"
 FilterDeclare NEWPATHS2
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
@@ -274,13 +275,13 @@ FilterChain NEWPATHS2
        ProxyPass        / https://www.webofknowledge.com/
        ProxyPassReverse / https://www.webofknowledge.com/
 
-       Header edit* Location "(https://apps.webofknowledge.com)/(.*)" "http://apps.webofknowledge.com.p.vbz.ffzg.hr/$2"
+       Header edit* Location "(https://apps.webofknowledge.com)/(.*)" "https://apps.webofknowledge.com.p.vbz.ffzg.hr/$2"
 
        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://apps.webofknowledge.com/|http://apps.webofknowledge.com.p.vbz.ffzg.hr/|n"
+Substitute "s|https://apps.webofknowledge.com/|https://apps.webofknowledge.com.p.vbz.ffzg.hr/|n"
 FilterDeclare NEWPATHS2
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
 FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
@@ -359,16 +360,17 @@ FilterChain NEWPATHS2
        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://([^/]*)/" "http://$1.p.vbz.ffzg.hr/"
+       Header edit* Location "https://([^/]*.nature.com)/" "https://$1.p.vbz.ffzg.hr/"
+
+RequestHeader unset Accept-Encoding
+Substitute "s|http://www.nature.com/|https://www.nature.com.p.vbz.ffzg.hr/|n"
+FilterDeclare NEWPATHS2
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|"
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|"
+FilterChain NEWPATHS2
 
-#RequestHeader unset Accept-Encoding
-#Substitute "s|https://idp.nature.com/|http://idp.nature.com.p.vbz.ffzg.hr/|n"
-#FilterDeclare NEWPATHS2
-#FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
-#FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/css|"
-#FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|"
-#FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|"
-#FilterChain NEWPATHS2
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 </VirtualHost>
 <VirtualHost *:443>
@@ -380,7 +382,7 @@ FilterChain NEWPATHS2
        ProxyPass        / https://idp.nature.com/
        ProxyPassReverse / https://idp.nature.com/
 
-       Header edit* Location "https://([^/]*)/" "http://$1.p.vbz.ffzg.hr/"
+       Header edit* Location "https://([^/]*.nature.com)/" "https://$1.p.vbz.ffzg.hr/"
        Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;][^;]+);" "$1 ; domain=$2.p.vbz.ffzg.hr;"
        Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"