From 9d4b15def68f729d4915a3265f366be3b9e13c06 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Tue, 3 Jan 2023 23:11:25 +0100 Subject: [PATCH] feat: better basic auth support --- templates/nginx_server_block.conf.j2 | 4 ++++ vm.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/nginx_server_block.conf.j2 b/templates/nginx_server_block.conf.j2 index 360988f..71c4d26 100644 --- a/templates/nginx_server_block.conf.j2 +++ b/templates/nginx_server_block.conf.j2 @@ -15,6 +15,10 @@ server{ proxy_pass http://{{ targetip }}:{{ targetport }}; proxy_set_header Host $http_host; {{ proxy_pass_blob }} + {% if basicauth %} + auth_basic "{{ basicauth }}"; + auth_basic_user_file /etc/nginx/{{ basicauth }}.htpasswd; + {% endif %} } } diff --git a/vm.py b/vm.py index fe9c3ec..45241a2 100644 --- a/vm.py +++ b/vm.py @@ -131,7 +131,8 @@ class VM: targetport = subdomain.get("port") or 80 component = template.render(targetip=self.ip, targetport=targetport, servernames=[subdomain["name"]], comment=compositeName, - proxy_pass_blob=self.proxy_pass_blob, acme=not self.noTerminateACME) + proxy_pass_blob=self.proxy_pass_blob, acme=not self.noTerminateACME, + basicauth=subdomain.get("basicauth")) components.append(component) return components