From 69340e47e6f69bbb030871445feb528fb0ab92e1 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Sun, 25 Dec 2022 14:36:48 +0100 Subject: [PATCH] feat: make acme termination optional --- templates/nginx_server_block.conf.j2 | 2 ++ vm.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/nginx_server_block.conf.j2 b/templates/nginx_server_block.conf.j2 index 84d740c..360988f 100644 --- a/templates/nginx_server_block.conf.j2 +++ b/templates/nginx_server_block.conf.j2 @@ -7,7 +7,9 @@ server{ {% if servernames %}server_name{% for s in servernames %} {{ s }}{% endfor %};{% endif %} + {% if acme %} include acme-challenge.conf; + {% endif %} location / { proxy_pass http://{{ targetip }}:{{ targetport }}; diff --git a/vm.py b/vm.py index 0bf97ee..f6dad81 100644 --- a/vm.py +++ b/vm.py @@ -13,6 +13,8 @@ class VM: self.terminateSSL = args.get("terminate-ssl") self.network = args.get("network") or "default" self.isExternal = args.get("external") + self.noTerminateACME = args.get("no-terminate-acme") + print(self.noTerminateACME) if self.isExternal: self.lease = None @@ -102,7 +104,7 @@ class VM: targetport = subdomain["port"] component = template.render(targetip=self.ip, targetport=targetport, 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) elif any([type(e) == dict for e in self.subdomains]): @@ -111,7 +113,7 @@ class VM: compositeName = "-".join((self.hostname, self.subdomains[0].replace(".","-"))) component = template.render(targetip=self.ip, targetport=targetport, 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) return components