From c218aebaaefad7dbcdb58f5f9b1a1e82e5ec229b Mon Sep 17 00:00:00 2001
From: Nicolas Roman <nroman@evolix.fr>
Date: Mon, 15 Jul 2019 17:06:50 +0200
Subject: [PATCH] bugfixes for the evoacme part

---
 inc/webadmin-letsencrypt.php | 3 +--
 scripts/web-add.sh           | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/inc/webadmin-letsencrypt.php b/inc/webadmin-letsencrypt.php
index 598eb01..9237b23 100644
--- a/inc/webadmin-letsencrypt.php
+++ b/inc/webadmin-letsencrypt.php
@@ -134,8 +134,7 @@ if (isset($_POST['submit'])) {
         }
 
         // evoacme
-        // $generateCert = $letsencrypt->generateSSLCertificate($params[1], false);
-        $generateCert = $letsencrypt->generateSSLCertificate($params[1]);
+        $generateCert = $letsencrypt->generateSSLCertificate($params[1], false);
 
         if (!$generateCert) {
             $errorMessage = "Erreur : La génération de certificat a échoué.<br>
diff --git a/scripts/web-add.sh b/scripts/web-add.sh
index d16c47e..9c81165 100755
--- a/scripts/web-add.sh
+++ b/scripts/web-add.sh
@@ -909,7 +909,7 @@ op_generatesslcertificate() {
         if [ "$test_mode" = "false" ]; then
             evoacme "$vhost"
         else
-            TEST=1 evoacme "$vhost"
+            DRY_RUN=1 evoacme "$vhost"
         fi
     else usage
     fi
@@ -917,7 +917,7 @@ op_generatesslcertificate() {
 
 op_updatesslvhost() {
     if [ $# -eq 1 ]; then
-        vhostfile="/etc/apache2/sites-enabled/$1.conf"
+        vhostfile="/etc/apache2/sites-available/$1.conf"
 
         sed -i "s/:80>/:80 *:443>/" "$vhostfile"