sheppy/athq-vm-management
1
0
Fork 0
mirror of https://github.com/FAUSheppy/athq-vm-management synced 2025-12-06 05:41:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: cleanup stdout output

Browse Source
This commit is contained in:
Johnathen Sheppard
2025-10-27 14:13:53 +01:00
parent 2a9559642b
commit c8640eb035
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nginx.py
View File

@@ -32,7 +32,7 @@ def dump_config(vmList, masterAddress):
for vmo in vmList: for vmo in vmList:
relevant_subdomains = filter(lambda x: x.get("no-terminate-ssl"), vmo.subdomains) relevant_subdomains = filter(lambda x: x.get("no-terminate-ssl"), vmo.subdomains)
for s in relevant_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 # # build the map contents #
if s.get("include-subdomains"): if s.get("include-subdomains"):
match = "~.*{}".format(s.get("name")) match = "~.*{}".format(s.get("name"))
@@ -66,7 +66,7 @@ def dump_config(vmList, masterAddress):
for vmo in vmList: for vmo in vmList:
for subdomain in vmo.subdomains: for subdomain in vmo.subdomains:
if vmo.noTerminateACME: if vmo.noTerminateACME:
print("Not terminating ACME for: {}".format(subdomain)) print("Not terminating ACME for: {}".format(subdomain.get("name")))
continue continue
if type(subdomain) == dict: if type(subdomain) == dict:
domains.append(subdomain["name"]) domains.append(subdomain["name"])
@@ -95,10 +95,10 @@ def dump_config(vmList, masterAddress):
f.write(content) f.write(content)
def check_transparent_proxy_loader(): 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: if retcode != 0:
print("############################ WARNING ###############################") print("############################ WARNING ###############################")
print("+++ You may have transparent proxy rules but the service to load +++") 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("+++ 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 ###############################") print("############################ WARNING ###############################")

2
vm.py
View File

@@ -146,7 +146,7 @@ class VM:
for subdomain in self.subdomains: for subdomain in self.subdomains:
if subdomain.get("no-terminate-ssl"): 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: if type(subdomain) != dict:
raise ValueError("Subdomain must be object containing 'name' ") raise ValueError("Subdomain must be object containing 'name' ")