From 1d7bc1e3874f20de1f00bdf7fb0dfd32e0403625 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Fri, 2 Oct 2020 14:35:54 +0200
Subject: [PATCH] Replaced certbot with ACME.sh

---
 AppendCMS.sh                              | 4 ++--
 CoreModules/apache/generic.pkg.list       | 2 +-
 CoreModules/generic/preconf.sh            | 2 --
 CoreModules/nginx/generic.pkg.list        | 2 +-
 CoreModules/nginx_nonphp/generic.pkg.list | 2 +-
 Scripts/EnableSSL.sh                      | 4 ++--
 installer.sh                              | 6 +++---
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/AppendCMS.sh b/AppendCMS.sh
index 96ddf96..3c9d026 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -218,9 +218,9 @@ msg "                Setting up SSL"
     fi
     site_ext=ssl
     if [ $domainwww = 1 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
     elif [ $domainwww = 0 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
     fi
     if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
         source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
diff --git a/CoreModules/apache/generic.pkg.list b/CoreModules/apache/generic.pkg.list
index c05a90a..b38f950 100644
--- a/CoreModules/apache/generic.pkg.list
+++ b/CoreModules/apache/generic.pkg.list
@@ -1 +1 @@
-apache2 libapache2-mod-fcgid python-certbot-apache
\ No newline at end of file
+apache2 libapache2-mod-fcgid
\ No newline at end of file
diff --git a/CoreModules/generic/preconf.sh b/CoreModules/generic/preconf.sh
index f7d9e74..8506a7a 100644
--- a/CoreModules/generic/preconf.sh
+++ b/CoreModules/generic/preconf.sh
@@ -10,8 +10,6 @@ curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/Genera
 
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=universe osrel=$shortdist bash > $OUTPUT 2>&1
 curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=php osrel=$shortdist bash > $OUTPUT 2>&1
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=certbot osrel=$shortdist bash > $OUTPUT 2>&1
-
 
 ##-------------##
 #    Updates    #
diff --git a/CoreModules/nginx/generic.pkg.list b/CoreModules/nginx/generic.pkg.list
index 23ff8c5..902a0e5 100644
--- a/CoreModules/nginx/generic.pkg.list
+++ b/CoreModules/nginx/generic.pkg.list
@@ -1 +1 @@
-nginx apache2-utils python-certbot-nginx
\ No newline at end of file
+nginx apache2-utils
\ No newline at end of file
diff --git a/CoreModules/nginx_nonphp/generic.pkg.list b/CoreModules/nginx_nonphp/generic.pkg.list
index 23ff8c5..902a0e5 100644
--- a/CoreModules/nginx_nonphp/generic.pkg.list
+++ b/CoreModules/nginx_nonphp/generic.pkg.list
@@ -1 +1 @@
-nginx apache2-utils python-certbot-nginx
\ No newline at end of file
+nginx apache2-utils
\ No newline at end of file
diff --git a/Scripts/EnableSSL.sh b/Scripts/EnableSSL.sh
index 14f49d6..b25ebe6 100644
--- a/Scripts/EnableSSL.sh
+++ b/Scripts/EnableSSL.sh
@@ -27,9 +27,9 @@ systemctl reload $webservice
 
 #Enabling SSL
 if [ $domainwww = 1 ]; then
-   certbot --"$webserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
 elif [ $domainwww = 0 ]; then
-   certbot --"$webserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
 fi  
 
 #Restoring config
diff --git a/installer.sh b/installer.sh
index 1233c2e..f931449 100644
--- a/installer.sh
+++ b/installer.sh
@@ -631,11 +631,11 @@ if [ $sslenable = 1 ]; then
     fi
     site_ext=ssl
     if [ $domainwww = 1 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -d "www.$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain" -d "www.$domain"
     elif [ $domainwww = 0 ]; then
-        certbot --"$certwebserv" certonly -n -d "$domain" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+        /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$domain"
     fi
-    certbot --"$certwebserv" certonly -n -d "$hostname" -m "$email" --hsts --redirect --no-eff-email --agree-tos
+    /opt/acmesh/acme.sh --config-home '/etc/acmesh/data' --issue --"$certwebserv" --ocsp --keylength 'ec-384' -d "$hostname"
     if curl --retry 2 --retry-delay 1 --output /dev/null --silent --head --fail "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh; then
         sslfr=1 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/"$branchtype"/"$branch"/CoreModules/"$webserv"/ssl-handler.sh)
     fi