diff --git a/src/batou_ext/mail.py b/src/batou_ext/mail.py index 4c3ba74..2adbaa3 100644 --- a/src/batou_ext/mail.py +++ b/src/batou_ext/mail.py @@ -180,7 +180,6 @@ class Mailpit(batou.component.Component): max = batou.component.Attribute(int, 500) - http_auth_enable = batou.component.Attribute("literal", default=False) http_basic_auth = None provide_as = None # (optional) str to self.provide() @@ -196,11 +195,10 @@ def configure(self): self.public_smtp_name, self.smtp_port ) - if self.http_auth_enable: - if self.http_basic_auth is None: - self.http_auth = self.require_one("http_basic_auth") - else: - self.http_auth = self.http_basic_auth + if self.http_basic_auth is None: + self.http_auth = self.require_one("http_basic_auth") + else: + self.http_auth = self.http_basic_auth self += batou.lib.file.File( "/etc/local/nixos/mailpit.nix", diff --git a/src/batou_ext/resources/mailpit.nix b/src/batou_ext/resources/mailpit.nix index 1b769f2..9d4f968 100644 --- a/src/batou_ext/resources/mailpit.nix +++ b/src/batou_ext/resources/mailpit.nix @@ -13,9 +13,7 @@ flyingcircus.services.nginx.virtualHosts."{{ component.public_name }}" = { forceSSL = true; enableACME = true; - # {% if component.http_auth_enable %} basicAuthFile = "{{component.http_auth.path}}"; - # {% endif %} locations."/" = { proxyPass = "http://[::1]:8025"; proxyWebsockets = true;