From c8640eb035d2b63b682accc87c090d0980d1e178 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 27 Oct 2025 14:13:53 +0100 Subject: [PATCH] fix: cleanup stdout output --- nginx.py | 8 ++++---- vm.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nginx.py b/nginx.py index 9e1f945..64a2a37 100644 --- a/nginx.py +++ b/nginx.py @@ -32,7 +32,7 @@ def dump_config(vmList, masterAddress): for vmo in vmList: relevant_subdomains = filter(lambda x: x.get("no-terminate-ssl"), vmo.subdomains) for s in relevant_subdomains: - print(s, "ssl_target_port", s.get("ssl_target_port")) + # print(s, "ssl_target_port", s.get("ssl_target_port")) # build the map contents # if s.get("include-subdomains"): match = "~.*{}".format(s.get("name")) @@ -66,7 +66,7 @@ def dump_config(vmList, masterAddress): for vmo in vmList: for subdomain in vmo.subdomains: if vmo.noTerminateACME: - print("Not terminating ACME for: {}".format(subdomain)) + print("Not terminating ACME for: {}".format(subdomain.get("name"))) continue if type(subdomain) == dict: domains.append(subdomain["name"]) @@ -95,10 +95,10 @@ def dump_config(vmList, masterAddress): f.write(content) def check_transparent_proxy_loader(): - retcode = os.system("systemctl is-enabled nginx-iptables.service") + retcode = os.system("systemctl -q is-enabled nginx-iptables.service") if retcode != 0: print("############################ WARNING ###############################") print("+++ You may have transparent proxy rules but the service to load +++") print("+++ them is not enabled or missing, a restart WILL break your +++") - print("+++ setup! Add see nginx-iptables.service in the project root +++") + print("+++ setup! Look at nginx-iptables.service in the project root +++") print("############################ WARNING ###############################") diff --git a/vm.py b/vm.py index a711d15..e8f6ee8 100644 --- a/vm.py +++ b/vm.py @@ -146,7 +146,7 @@ class VM: for subdomain in self.subdomains: if subdomain.get("no-terminate-ssl"): - print("Not terminating TLS for: {}".format(subdomain)) + print("Not terminating TLS for: {}".format(subdomain.get("name"))) if type(subdomain) != dict: raise ValueError("Subdomain must be object containing 'name' ")