diff --git a/machines/bomba/services/default.nix b/machines/bomba/services/default.nix index 54b6c82..4fda18b 100644 --- a/machines/bomba/services/default.nix +++ b/machines/bomba/services/default.nix @@ -1,11 +1,10 @@ { ... }: { imports = [ - # ./nginx.nix + ./nginx.nix ./gitea.nix ./nextcloud.nix ./ntfy.nix - ./maddy.nix ./octoprint.nix ./vaultwarden.nix ]; diff --git a/machines/bomba/services/maddy.nix b/machines/bomba/services/maddy.nix deleted file mode 100644 index 6a1b6c7..0000000 --- a/machines/bomba/services/maddy.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - pkgs, - config, - options, - currentSystemEmail, - ... -}: -{ - services.maddy = { - enable = true; - primaryDomain = "patrickcanal.it"; - ensureAccounts = [ - "postmaster@patrickcanal.it" - "test@patrickcanal.it" - ]; - ensureCredentials = { - "postmaster@patrickcanal.it".passwordFile = "${pkgs.writeText "postmaster" "test"}"; - "test@patrickcanal.it".passwordFile = "${pkgs.writeText "test" "test"}"; - }; - tls = { - loader = "file"; - certificates = [ - { - keyPath = "/etc/ssl/certs/privkey.pem"; - certPath = "/etc/ssl/certs/fullchain.pem"; - } - ]; - }; - config = - builtins.replaceStrings - [ - "imap tcp://0.0.0.0:143" - "submission tcp://0.0.0.0:587" - ] - [ - "imap tls://0.0.0.0:993 tcp://0.0.0.0:143" - "submission tls://0.0.0.0:465 tcp://0.0.0.0:587" - ] - options.services.maddy.config.default; - }; -}