From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Thu, 9 Apr 2020 08:45:31 +0000 (+0200)
Subject: move www.bmj.com to p2.vbz.ffzg.hr
X-Git-Url: http://git.rot13.org/?p=via-proxy;a=commitdiff_plain;h=8ed436573c8bd64389cc8f3622878bfbd9826fec

move www.bmj.com to p2.vbz.ffzg.hr
---

diff --git a/index.html b/index.html
index eed1585..5d05db6 100644
--- a/index.html
+++ b/index.html
@@ -24,7 +24,9 @@
 <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>
 
 
@@ -42,6 +44,10 @@
 	<li><a href="https://www.emerald.com.p.vbz.ffzg.hr/insight/">emerald insight</a>
 </ul>
 
+<ul>
+<li><a href="https://journals.bmj.com.p2.vbz.ffzg.hr/">bmj</a>
+</ul>
+
 <!--
 <pre>
 http://muse.jhu.edu/journals/index.html
diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index fa30764..0cc5264 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -683,37 +683,6 @@ 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
-
-	RequestHeader unset Accept-Encoding
-	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|"
-	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
-
-	# fix all other plain http resources
-	RewriteEngine on
-	RewriteRule	/_rewrite_/(.*)/_path_/(.*)	https://$1.bmj.com/$2 [P,L]
-
-	SSLProxyEngine on
-	ProxyAddHeaders Off
-	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
diff --git a/providers/www.bmj.com.conf b/providers/www.bmj.com.conf
index 56f69f5..0badb23 100644
--- a/providers/www.bmj.com.conf
+++ b/providers/www.bmj.com.conf
@@ -31,11 +31,12 @@
 
 	Header edit* Set-Cookie "(.*)(?i:; *domain=)([^;]+)(.*)" "$1 ; domain=$2.p2.vbz.ffzg.hr $3"
 	#Header edit* Set-Cookie "(.*)(?i:; *secure)" "$1"
-	Header edit* Location "https://([a-z]+).bmj.com" "https://$1.bmj.com.p2.vbz.ffzg.hr"
+	Header edit* Location "https://([a-z]+).bmj.com/" "https://$1.bmj.com.p2.vbz.ffzg.hr/"
 
 	RequestHeader unset Accept-Encoding
-	# we don't use https:// here because some urls are in javascript with escaped http:\/\/
-	Substitute "s|(\w+)\.bmj\.com|$1.bmj.com.p2.vbz.ffzg.hr|i"
+	# we don't use only https:// here because some urls are in javascript with escaped http:\/\/
+	Substitute "s|https://(\w+)\.bmj\.com|https://$1.bmj.com.p2.vbz.ffzg.hr|i"
+	Substitute "s|http://(\w+)\.bmj\.com|https://$1.bmj.com.p2.vbz.ffzg.hr|i"
 
 	FilterDeclare NEWPATHS
 	FilterProvider NEWPATHS SUBSTITUTE "%{Content_Type} =~ m|^text/html|"