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

feat: make acme termination optional

Browse Source
This commit is contained in:
Johnathen Sheppard
2022-12-25 14:36:48 +01:00
parent 89404b358d
commit 69340e47e6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/nginx_server_block.conf.j2
View File

@@ -7,7 +7,9 @@ server{
{% if servernames %}server_name{% for s in servernames %} {{ s }}{% endfor %};{% endif %} {% if servernames %}server_name{% for s in servernames %} {{ s }}{% endfor %};{% endif %}
{% if acme %}
include acme-challenge.conf; include acme-challenge.conf;
{% endif %}
location / { location / {
proxy_pass http://{{ targetip }}:{{ targetport }}; proxy_pass http://{{ targetip }}:{{ targetport }};

6
vm.py
View File

@@ -13,6 +13,8 @@ class VM:
self.terminateSSL = args.get("terminate-ssl") self.terminateSSL = args.get("terminate-ssl")
self.network = args.get("network") or "default" self.network = args.get("network") or "default"
self.isExternal = args.get("external") self.isExternal = args.get("external")
self.noTerminateACME = args.get("no-terminate-acme")
print(self.noTerminateACME)
if self.isExternal: if self.isExternal:
self.lease = None self.lease = None
@@ -102,7 +104,7 @@ class VM:
targetport = subdomain["port"] targetport = subdomain["port"]
component = template.render(targetip=self.ip, targetport=targetport, component = template.render(targetip=self.ip, targetport=targetport,
servernames=[subdomain["name"]], comment=compositeName, servernames=[subdomain["name"]], comment=compositeName,
proxy_pass_blob=self.proxy_pass_blob) proxy_pass_blob=self.proxy_pass_blob, acme=not self.noTerminateACME)
components.append(component) components.append(component)
elif any([type(e) == dict for e in self.subdomains]): elif any([type(e) == dict for e in self.subdomains]):
@@ -111,7 +113,7 @@ class VM:
compositeName = "-".join((self.hostname, self.subdomains[0].replace(".","-"))) compositeName = "-".join((self.hostname, self.subdomains[0].replace(".","-")))
component = template.render(targetip=self.ip, targetport=targetport, component = template.render(targetip=self.ip, targetport=targetport,
servernames=self.subdomains, comment=compositeName, servernames=self.subdomains, comment=compositeName,
proxy_pass_blob=self.proxy_pass_blob) proxy_pass_blob=self.proxy_pass_blob, acme= not self.noTerminateACME)
components.append(component) components.append(component)
return components return components