mailpit: reject configurations w/o basic auth

flyingcircusio · Aug 14, 2024 · 0a92dcd · 0a92dcd
1 parent 1d18501
commit 0a92dcd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git 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
@@ -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;