X-Git-Url: http://git.rot13.org/?p=via-proxy;a=blobdiff_plain;f=p.vbz.ffzg.hr.conf;h=1c673a15ac2ea95ed1b078dccb97c2c17ca7a20c;hp=53edfaabbf4d9566fd4737c78e3484f557e752e8;hb=bab53af74d578578be4cd732a1fc9e3a91af8f1a;hpb=c1cf16b059e17b592d98bbd9091f55cef34a948b

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index 53edfaa..1c673a1 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -22,6 +22,8 @@
 	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>
@@ -45,6 +47,8 @@
 	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
@@ -88,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>
@@ -112,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>
@@ -137,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
@@ -163,6 +173,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>
@@ -180,6 +192,8 @@ FilterChain NEWPATHS2
 
 	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
+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
@@ -195,45 +209,48 @@ 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>
 	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"
 
 	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 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|"
@@ -242,6 +259,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
@@ -250,21 +269,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|"
@@ -273,6 +291,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>
 
 
@@ -300,6 +320,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
@@ -324,6 +346,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>
 
 
@@ -342,6 +366,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>
 
 
@@ -360,6 +386,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>
 
 
@@ -390,6 +418,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
@@ -418,6 +448,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>
@@ -444,6 +476,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>
@@ -460,6 +494,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>
 
 
@@ -514,6 +550,8 @@ 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>
@@ -541,6 +579,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
@@ -557,6 +597,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>
 
 
@@ -594,6 +636,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>
@@ -620,6 +664,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
@@ -649,6 +695,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>
@@ -665,6 +713,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>
@@ -682,31 +732,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"
-
-	RequestHeader unset Accept-Encoding
-	Substitute "s|https://www.scopus.com|https://www.scopus.com.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>
@@ -715,7 +742,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,33 +753,19 @@ FilterChain NEWPATHS2
 
 	# fix all other plain http resources
 	RewriteEngine on
-	RewriteRule	/_rewrite_/(.*)/_path_/(.*)	http://$1.bmj.com/$2 [P,L]
-
-	#SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / http://journals.bmj.com/
-	ProxyPassReverse / http://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
-</VirtualHost>
+	RewriteRule	/_rewrite_/(.*)/_path_/(.*)	https://$1.bmj.com/$2 [P,L]
 
-<VirtualHost *:443>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName journals.bmj.com.p.vbz.ffzg.hr
-
-	#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>
@@ -782,45 +795,10 @@ 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>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName jcr.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
-	SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / https://jcr.incites.thomsonreuters.com/
-	ProxyPassReverse / https://jcr.incites.thomsonreuters.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://.*.incites.thomsonreuters.com)/?(.*)" "$1.p.vbz.ffzg.hr/$2"
-
-
-	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-</VirtualHost>
-<VirtualHost *:443>
-	Include /srv/via-proxy/ssl.conf
-
-	ServerName login.incites.thomsonreuters.com.p.vbz.ffzg.hr
-
-	SSLProxyEngine on
-	ProxyAddHeaders Off
-	ProxyPass        / https://login.incites.thomsonreuters.com/
-	ProxyPassReverse / https://login.incites.thomsonreuters.com/
-
-	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"
-
-	CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
-</VirtualHost>
 
 <VirtualHost *:443>
 	Include /srv/via-proxy/ssl.conf
@@ -836,6 +814,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>
@@ -864,6 +844,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
@@ -889,8 +871,11 @@ 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>
 
+IncludeOptional /srv/via-proxy/providers/*.conf
 
 
 
@@ -918,6 +903,8 @@ NameVirtualHost *:443
 
 	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>