Fix openssl no longer prints progression in the console
This commit is contained in:
parent
2e144bf46e
commit
ce85bc6b8f
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue