From: Zoltán Felleg <zoltan.felleg@userrendszerhaz.hu>
Date: Tue, 2 Jun 2020 14:03:11 +0000 (+0200)
Subject: Updated ws.pm (updated certbot apache configuration).
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=e12995192b86829cab523cc64d76775d4810c89d;p=user-lxc.git

Updated ws.pm (updated certbot apache configuration).
---

diff --git a/sources/ws.pm/firstboot/10_certbot.sh b/sources/ws.pm/firstboot/10_certbot.sh
index 620271b..0393d05 100755
--- a/sources/ws.pm/firstboot/10_certbot.sh
+++ b/sources/ws.pm/firstboot/10_certbot.sh
@@ -21,9 +21,7 @@ certbot certonly \
         -d svn.useribm.hu \
         -d svn.userrendszerhaz.hu \
         -d useribm.hu \
-        -d userrendszerhaz.hu \
         -d www.useribm.hu \
-        -d www.userrendszerhaz.hu \
         -m zoltan.felleg@userrendszerhaz.hu
 RC=$?
 echo "RC: $RC"
@@ -34,9 +32,12 @@ then
         cf=$(echo $f | sed 's/^\(.*\).le$/\1/')
         mv $f $cf
     done
-    cp --archive /usr/lib/python3.7/site-packages/certbot_apache/options-ssl-apache.conf /etc/letsencrypt
-    systemctl enable httpd.service
-    systemctl start httpd.service
+    /usr/bin/cp \
+        --archive \
+        /usr/lib/python3.8/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf
+        /etc/letsencrypt/options-ssl-apache.conf
     systemctl enable certbot-renew.timer
     systemctl start certbot-renew.timer
+    systemctl enable httpd.service
+    systemctl start httpd.service
 fi