X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=fa30764e7061c1909cfd24e9ccf54281990cc143;hp=ffb40dc3320e1f0c750cff9fc96e6f633d886226;hb=6a0ade82601fa3feb8a1e52dd9974d2a59ba4ca8;hpb=8b641e384c0134bf4d4ad5697ac9064f699737f1

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index ffb40dc..fa30764 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -5,11 +5,50 @@
 	Include /srv/via-proxy/ssl.conf
 	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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
+</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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 # a2enmod proxy_http proxy_html xml2enc headers
@@ -53,6 +92,8 @@ FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|"
 FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|"
 FilterChain NEWPATHS
 
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -77,6 +118,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -102,6 +145,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 # https://www.oclc.org/support/services/ezproxy/documentation/db/ovid.en.html
@@ -128,77 +173,31 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </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|"
@@ -207,6 +206,8 @@ FilterChain NEWPATHS2
 	FilterChain NEWPATHS
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -215,21 +216,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|"
@@ -238,6 +238,8 @@ FilterChain NEWPATHS2
 	FilterChain NEWPATHS
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -265,6 +267,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -289,6 +293,8 @@ 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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -307,6 +313,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -325,6 +333,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -355,6 +365,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -383,6 +395,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -409,6 +423,8 @@ 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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -425,6 +441,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -433,21 +451,31 @@ FilterChain NEWPATHS2
 
 	ServerName www.jstor.org.p.vbz.ffzg.hr
 
-	#SSLProxyEngine on
-	# download pdf doesn't work if we use https://www.jstor.org !
+	SSLProxyEngine on
 	ProxyAddHeaders Off
-	ProxyPass        / http://www.jstor.org/
-	ProxyPassReverse / http://www.jstor.org/
+	ProxyPass        / https://www.jstor.org/
+	ProxyPassReverse / https://www.jstor.org/
 
 	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p.vbz.ffzg.hr $3"
-	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
+#	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
-#	Header edit* Referer "http://(.*)(?i:\.p\.vbz\.ffzg\.hr)" "https://$1$2"
+	#Header edit* Referer "http://(.*)(?i:\.p\.vbz\.ffzg\.hr)" "https://$1$2"
+	RequestHeader edit* Referer "//(.*)(?i:\.p\.vbz\.ffzg\.hr)" "//$1$2"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 
-	#Header add Access-Control-Allow-Origin ''
-	#Header add Access-Control-Allow-Headers "X-Requested-With, Content-Type"
+#	Header set Access-Control-Allow-Origin "*"
+#	Header set Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept"
+
+	# jstor expects
+	# X-Requested-With: XMLHttpRequest
+	# https://www.jstor.org/ui_log/info
+	# https://www.jstor.org/access_details/?_=1535108073005
+	# https://www.jstor.org/workspace-service/get-dois?_=1535108073006
+	# https://www.jstor.org/tc/check/10.2307/40323659?_=1535108073007
+	# https://www.jstor.org/tc/accept?origin=%2Ftc%2Fcheck%2F10.2307%2F40323659%3F_%3D1535108073007
+	# https://www.jstor.org/ui_log/counter
+	#
 
 	#Header always set Access-Control-Allow-Origin "*"
 	#Header always set Access-Control-Max-Age "1000"
@@ -458,17 +486,19 @@ FilterChain NEWPATHS2
 #	SetEnvIf X-Requested-With (.*) saved_x_requested_with=$1
 #	RequestHeader set X-Requested-With "%{saved_x_requested_with}e"
 
-	#ForensicLog /var/log/apache2/forensic.log
+	#ForensicLog /var/log/apache2/forensic-jstor.log
 
-#RequestHeader unset Accept-Encoding
-#Substitute "s|http://www.jsor.org/|http://www.jstor.org.p.vbz.ffzg.hr/|n"
-#FilterDeclare NEWPATHS2
-#FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/html|"
+RequestHeader unset Accept-Encoding
+Substitute "s|//www.jstor.org/|//www.jstor.org.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
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|"
+FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|"
+FilterChain NEWPATHS2
 
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -484,10 +514,10 @@ 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://([^/]*.nature.com)/" "https://$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"
+Substitute "s|https://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|"
@@ -496,6 +526,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -512,6 +544,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -537,7 +571,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 RequestHeader unset Accept-Encoding
-Substitute "s|https?://www.palgrave.com/|https://www.palgrave.com.p.vbz.ffzg.hr/|n"
+Substitute "s|https://www.palgrave.com|https://www.palgrave.com.p.vbz.ffzg.hr|n"
+Substitute "s|http://www.palgrave.com|https://www.palgrave.com.p.vbz.ffzg.hr|n"
 Substitute "s|http://link.springer.com|https://link.springer.com.p.vbz.ffzg.hr|n"
 Substitute "s|http://www.springer.com|https://www.springer.com.p.vbz.ffzg.hr|n"
 FilterDeclare NEWPATHS2
@@ -548,6 +583,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -574,12 +611,18 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
 
 	ServerName link.springer.com.p.vbz.ffzg.hr
 
+	# download links to pdf have %2F instead of / in them
+	AllowEncodedSlashes On
+	# this might need nocanon in ProxyPass too!
+
 	SSLProxyEngine on
 	ProxyAddHeaders Off
 	ProxyPass        / https://link.springer.com/
@@ -599,6 +642,8 @@ FilterProvider NEWPATHS2 SUBSTITUTE "%{Content_Type} =~ m|^application/javascrip
 FilterChain NEWPATHS2
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -615,6 +660,8 @@ FilterChain NEWPATHS2
 	Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -632,22 +679,8 @@ 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"
-
-	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -656,7 +689,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|"
@@ -667,103 +700,129 @@ 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"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </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|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|"
+	FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/javascript|"
+	FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^application/javascript|"
+	FilterChain NEWPATHS
 
-	#SSLProxyEngine on
 	ProxyAddHeaders Off
-	ProxyPass        / http://journals.bmj.com/
-	ProxyPassReverse / http://journals.bmj.com/
+	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        / 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"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </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"
 
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </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
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
-
+IncludeOptional /srv/via-proxy/providers/*.conf
 
 
 
@@ -780,6 +839,19 @@ NameVirtualHost *:443
 	ServerAlias *.p.vbz.ffzg.hr
 	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
 
+	ProxyAddHeaders Off
+
+	#ForensicLog /var/log/apache2/forensic-p.vbz.ffzg.hr.log
+
+	ProxyPass        /mjesec/ http://mjesec.ffzg.hr/
+	ProxyPassReverse /mjesec/ http://mjesec.ffzg.hr/
+
+	RequestHeader edit* Referer "//(.*)(?i:\.p\.vbz\.ffzg\.hr)" "//$1$2"
+
+	ProxyPass        /via/ http://via.rot13.org/
+	ProxyPassReverse /via/ http://via.rot13.org/
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 <VirtualHost *:80>