From e281e912d8d523eaf7740b99e9b952e85cd5e22f Mon Sep 17 00:00:00 2001 From: natto1784 Date: Mon, 7 Aug 2023 04:59:53 +0530 Subject: [PATCH] hosts/marisa: fix gitea mailer Signed-off-by: natto1784 --- hosts/marisa/services/filehost.nix | 3 ++- hosts/marisa/services/gitea.nix | 2 +- hosts/modules/minimal.nix | 1 - lib/network.nix | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hosts/marisa/services/filehost.nix b/hosts/marisa/services/filehost.nix index 579fb37..d0db3e9 100644 --- a/hosts/marisa/services/filehost.nix +++ b/hosts/marisa/services/filehost.nix @@ -7,9 +7,10 @@ Type = "simple"; Environment = [ "TITLE=nattofiles" - "USER_URL=${lib'.network.addresses.subdomain.natto "f"}" + "USER_URL=https://f.${lib'.network.addresses.domain.natto}" "ROCKET_LIMITS={file=\"512MB\",data-form=\"512MB\"}" "ROCKET_LOG_LEVEL=debug" + "ROCKET_ADDRESS=0.0.0.0" ]; Restart = "on-failure"; ExecStart = "${inputs.filehost.packages.${pkgs.system}.simpler-filehost}/bin/simpler-filehost"; diff --git a/hosts/marisa/services/gitea.nix b/hosts/marisa/services/gitea.nix index 9c22d11..eff240a 100644 --- a/hosts/marisa/services/gitea.nix +++ b/hosts/marisa/services/gitea.nix @@ -27,7 +27,7 @@ ENABLED = true; FROM = "masti@${domain}"; TYPE = "smtp"; - HOST = domain; + HOST = "mail.${domain}"; IS_TLS_ENABLED = true; USER = FROM; REGISTER_MAIL_CONFIRM = true; diff --git a/hosts/modules/minimal.nix b/hosts/modules/minimal.nix index 079d1a1..fa67914 100644 --- a/hosts/modules/minimal.nix +++ b/hosts/modules/minimal.nix @@ -23,7 +23,6 @@ rnix-lsp nmap gcc - postgresql #for the client cli ]; programs = { diff --git a/lib/network.nix b/lib/network.nix index fe565f7..5defab0 100644 --- a/lib/network.nix +++ b/lib/network.nix @@ -13,7 +13,6 @@ domain = { natto = "weirdnatto.in"; }; - subdomain = builtins.mapAttrs(_: domain: (sub: "${sub}.${domain}")) domain; }; commonSSHKeys = [