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

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index fa30764..d34c579 100644
--- a/p.vbz.ffzg.hr.conf
+++ b/p.vbz.ffzg.hr.conf
@@ -22,8 +22,6 @@
 	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>
@@ -47,8 +45,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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
@@ -92,8 +88,6 @@ 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>
@@ -118,8 +112,6 @@ 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>
@@ -145,8 +137,6 @@ 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
@@ -173,8 +163,6 @@ 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>
 
 
@@ -206,8 +194,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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
@@ -238,8 +224,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -267,8 +251,6 @@ 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
@@ -293,8 +275,6 @@ 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>
 
 
@@ -313,8 +293,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -333,8 +311,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -365,8 +341,6 @@ 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
@@ -395,8 +369,6 @@ 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>
@@ -423,8 +395,6 @@ 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>
@@ -441,8 +411,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -497,8 +465,6 @@ 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>
@@ -526,8 +492,6 @@ 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
@@ -544,8 +508,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -583,8 +545,6 @@ 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>
@@ -611,8 +571,6 @@ 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
@@ -642,8 +600,6 @@ 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>
@@ -660,8 +616,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
@@ -679,41 +633,8 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 
 
 	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
-
-	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
@@ -742,8 +663,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
 
 
@@ -761,8 +680,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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>
@@ -791,8 +708,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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
@@ -818,8 +733,6 @@ SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 	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
@@ -850,8 +763,6 @@ 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>