From 6ade7f3206a6066a2e4f7ba420195d8a74594ef7 Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 2 Aug 2019 12:10:44 +0200
Subject: [PATCH] Fix wo-kernel service not installed

---
 install                          | 32 +++++++++++++++++---------------
 wo/cli/plugins/site_functions.py |  5 +++++
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/install b/install
index 204861e..365775c 100755
--- a/install
+++ b/install
@@ -663,22 +663,24 @@ wo_tweak_kernel() {
             fi
             # apply sysctl tweaks
             sysctl -eq -p /etc/sysctl.d/60-wo-tweaks.conf
-            if [ ! -x /opt/wo-kernel.sh ]; then
-                {
-                    # download and setup wo-kernel systemd service to apply kernel tweaks for netdata and redis on server startup
-                    wget -qO /opt/wo-kernel.sh https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-script.mustache
-                    chmod +x /opt/wo-kernel.sh
-                    wget -qO /lib/systemd/system/wo-kernel.service https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-service.mustache
-                    systemctl enable wo-kernel.service
-                    systemctl start wo-kernel.service
-                } >> /var/log/wo/install.log 2>&1
-            fi
+        else
+            sysctl -eq -p /etc/sysctl.d/60-wo-tweaks.conf
+        fi
+        if [ ! -x /opt/wo-kernel.sh ]; then
+            {
+                # download and setup wo-kernel systemd service to apply kernel tweaks for netdata and redis on server startup
+                wget -qO /opt/wo-kernel.sh https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-script.mustache
+                chmod +x /opt/wo-kernel.sh
+                wget -qO /lib/systemd/system/wo-kernel.service https://raw.githubusercontent.com/WordOps/WordOps/updating-configuration/wo/cli/templates/wo-kernel-service.mustache
+                systemctl enable wo-kernel.service
+                systemctl start wo-kernel.service
+            } >> /var/log/wo/install.log 2>&1
+        fi
 
-        fi
-        LIMIT_CHECK=$(grep "500000" /etc/security/limits.conf)
-        if [ -z "$LIMIT_CHECK" ]; then
-            echo -e "*         hard    nofile      500000\n*         soft    nofile      500000\nroot      hard    nofile      500000\nroot      soft    nofile      500000\n" >> /etc/security/limits.conf
-        fi
+    fi
+    LIMIT_CHECK=$(grep "500000" /etc/security/limits.conf)
+    if [ -z "$LIMIT_CHECK" ]; then
+        echo -e "*         hard    nofile      500000\n*         soft    nofile      500000\nroot      hard    nofile      500000\nroot      soft    nofile      500000\n" >> /etc/security/limits.conf
     fi
 
 }
diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py
index ae6e430..4181afe 100644
--- a/wo/cli/plugins/site_functions.py
+++ b/wo/cli/plugins/site_functions.py
@@ -1384,13 +1384,16 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
                                                      'keylength'))
         if wo_dns:
             acme_mode = "--dns {0}".format(wo_acme_dns)
+            validation_mode = "DNS with {0}".format(wo_acme_dns)
             Log.debug(
                 self, "Validation : DNS mode with {0}".format(wo_acme_dns))
         else:
             acme_mode = "-w /var/www/html"
+            validation_mode = "Webroot challenge"
             Log.debug(self, "Validation : Webroot mode")
         if subdomain:
             Log.info(self, "Issuing subdomain SSL cert with acme.sh")
+            Log.info(self, "Validation mode : {0}".format(validation_mode))
             ssl = WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
                                        "--config-home "
                                        "'/etc/letsencrypt/config' "
@@ -1402,6 +1405,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
                                                keylenght))
         elif wildcard:
             Log.info(self, "Issuing Wildcard SSL cert with acme.sh")
+            Log.info(self, "Validation mode : {0}".format(validation_mode))
             ssl = WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
                                        "--config-home "
                                        "'/etc/letsencrypt/config' "
@@ -1413,6 +1417,7 @@ def setupLetsEncrypt(self, wo_domain_name, subdomain=False, wildcard=False,
                                                keylenght))
         else:
             Log.info(self, "Issuing domain SSL cert with acme.sh")
+            Log.info(self, "Validation mode : {0}".format(validation_mode))
             ssl = WOShellExec.cmd_exec(self, "/etc/letsencrypt/acme.sh "
                                        "--config-home "
                                        "'/etc/letsencrypt/config' "