certbot moved certificate to each vhost

diff --git a/p.vbz.ffzg.hr.conf b/p.vbz.ffzg.hr.conf
index ede06fb..1c673a1 100644 (file)
--- 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,6 +209,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>
@@ -211,6 +227,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>
@@ -241,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
@@ -271,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>
 
 
@@ -298,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
@@ -322,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>
 
 
@@ -340,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>
 
 
@@ -358,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>
 
 
@@ -388,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
@@ -416,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>
@@ -442,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>
@@ -458,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>
 
 
@@ -512,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>
@@ -539,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
@@ -555,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>
 
 
@@ -592,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>
@@ -618,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
@@ -647,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>
@@ -663,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>
@@ -680,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>
@@ -735,22 +764,8 @@ FilterChain NEWPATHS2
        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.bmj.com.p.vbz.ffzg.hr
-
-       #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
+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>
@@ -780,6 +795,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>
 
 
@@ -797,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>
@@ -825,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
@@ -850,6 +871,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>
 
 IncludeOptional /srv/via-proxy/providers/*.conf
@@ -880,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>

diff --git a/providers/clarivate.com.conf b/providers/clarivate.com.conf
index f7c96d0..aa5890b 100644 (file)
--- a/providers/clarivate.com.conf
+++ b/providers/clarivate.com.conf
@@ -51,6 +51,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -103,6 +106,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -155,6 +161,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -207,6 +216,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -259,6 +271,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -311,6 +326,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -363,6 +381,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -415,6 +436,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -467,6 +491,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -519,6 +546,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 
@@ -571,6 +601,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 

diff --git a/providers/www.annualreviews.org.conf b/providers/www.annualreviews.org.conf
index 19be79d..8eb486d 100644 (file)
--- a/providers/www.annualreviews.org.conf
+++ b/providers/www.annualreviews.org.conf
@@ -28,6 +28,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 

diff --git a/providers/www.bmj.com.conf b/providers/www.bmj.com.conf
index 7d6b07a..56f69f5 100644 (file)
--- a/providers/www.bmj.com.conf
+++ b/providers/www.bmj.com.conf
@@ -1,7 +1,8 @@
 # see certbot-wildcard.txt to see how is this configured
 
 <VirtualHost *:443>
-       Include /srv/via-proxy/ssl.conf
+       #Include /srv/via-proxy/ssl.conf
+       Include /srv/via-proxy/sso-pubtkt.conf
 
        SSLCertificateFile      /etc/letsencrypt/live/p2.vbz.ffzg.hr/cert.pem
        SSLCertificateKeyFile   /etc/letsencrypt/live/p2.vbz.ffzg.hr/privkey.pem

diff --git a/providers/www.emerald.com.conf b/providers/www.emerald.com.conf
index 0f6622f..57b163b 100644 (file)
--- a/providers/www.emerald.com.conf
+++ b/providers/www.emerald.com.conf
@@ -31,6 +31,9 @@
        FilterChain NEWPATHS
 
        CustomLog /var/log/apache2/access-p.vbz.ffzg.hr.log vhost_combined
+Include /etc/letsencrypt/options-ssl-apache.conf
+SSLCertificateFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/p.vbz.ffzg.hr-0001/privkey.pem
 </VirtualHost>
 
 

diff --git a/ssl.conf b/ssl.conf
index 43bc97b..0fd672c 100644 (file)
--- a/ssl.conf
+++ b/ssl.conf
@@ -1,8 +1,5 @@
+Include /etc/letsencrypt/options-ssl-apache.conf
 
-       SSLEngine on
-       SSLCertificateFile      /etc/letsencrypt/live/proxy.knjiznice.ffzg.hr/cert.pem
-       SSLCertificateKeyFile   /etc/letsencrypt/live/proxy.knjiznice.ffzg.hr/privkey.pem
-       SSLCertificateChainFile /etc/letsencrypt/live/proxy.knjiznice.ffzg.hr/chain.pem
 
 <Location />