From ce85bc6b8f4cf75d01280be4e1f174575499fc4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <theophile.diot900@gmail.com>
Date: Tue, 21 Mar 2023 13:51:13 +0100
Subject: [PATCH] Fix openssl no longer prints progression in the console

---
 src/common/core/misc/jobs/default-server-cert.py |  4 +++-
 src/common/core/selfsigned/jobs/self-signed.py   |  2 +-
 src/scheduler/JobScheduler.py                    | 10 ++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/common/core/misc/jobs/default-server-cert.py b/src/common/core/misc/jobs/default-server-cert.py
index c07613c6c..dc7238068 100644
--- a/src/common/core/misc/jobs/default-server-cert.py
+++ b/src/common/core/misc/jobs/default-server-cert.py
@@ -50,11 +50,13 @@ try:
     if need_default_cert:
         makedirs("/var/cache/bunkerweb/default-server-cert", exist_ok=True)
         if not isfile("/var/cache/bunkerweb/default-server-cert/cert.pem"):
+            logger.info("Generating self-signed certificate for default server")
+
             cmd = "openssl req -nodes -x509 -newkey rsa:4096 -keyout /var/cache/bunkerweb/default-server-cert/cert.key -out /var/cache/bunkerweb/default-server-cert/cert.pem -days 3650".split(
                 " "
             )
             cmd.extend(["-subj", "/C=AU/ST=Some-State/O=Internet Widgits Pty Ltd/"])
-            proc = run(cmd, stdin=DEVNULL, stderr=STDOUT)
+            proc = run(cmd, stdin=DEVNULL, stderr=DEVNULL)
             if proc.returncode != 0:
                 logger.error(
                     "Self-signed certificate generation failed for default server",
diff --git a/src/common/core/selfsigned/jobs/self-signed.py b/src/common/core/selfsigned/jobs/self-signed.py
index b2f6c1a3e..e110e5b4a 100755
--- a/src/common/core/selfsigned/jobs/self-signed.py
+++ b/src/common/core/selfsigned/jobs/self-signed.py
@@ -36,7 +36,7 @@ def generate_cert(first_server, days, subj):
 
     logger.info(f"Generating self-signed certificate for {first_server}")
     cmd = f"openssl req -nodes -x509 -newkey rsa:4096 -keyout /var/cache/bunkerweb/selfsigned/{first_server}.key -out /var/cache/bunkerweb/selfsigned/{first_server}.pem -days {days} -subj {subj}"
-    proc = run(cmd.split(" "), stdin=DEVNULL, stderr=STDOUT)
+    proc = run(cmd.split(" "), stdin=DEVNULL, stderr=DEVNULL)
     if proc.returncode != 0:
         logger.error(f"Self-signed certificate generation failed for {first_server}")
         return False, 2
diff --git a/src/scheduler/JobScheduler.py b/src/scheduler/JobScheduler.py
index 11e95ec7f..ee436d65e 100644
--- a/src/scheduler/JobScheduler.py
+++ b/src/scheduler/JobScheduler.py
@@ -79,10 +79,7 @@ class JobScheduler(ApiCaller):
         if self.__integration == "Linux":
             self.__logger.info("Reloading nginx ...")
             proc = run(
-                ["nginx", "-s", "reload"],
-                stdin=DEVNULL,
-                stderr=PIPE,
-                env=self.__env,
+                ["nginx", "-s", "reload"], stdin=DEVNULL, stderr=PIPE, env=self.__env
             )
             reload = proc.returncode == 0
             if reload:
@@ -107,10 +104,7 @@ class JobScheduler(ApiCaller):
         success = True
         try:
             proc = run(
-                f"{path}jobs/{file}",
-                stdin=DEVNULL,
-                stderr=STDOUT,
-                env=self.__env,
+                f"{path}jobs/{file}", stdin=DEVNULL, stderr=STDOUT, env=self.__env
             )
         except BaseException:
             success = False