diff --git a/modules/nixos/zulip.nix b/modules/nixos/zulip.nix index e1cc598..b0ff8d4 100644 --- a/modules/nixos/zulip.nix +++ b/modules/nixos/zulip.nix @@ -1,9 +1,11 @@ {config, ...}: { - imports = [ - ./mailserver.nix - ]; services.zulip = { enable = true; + + # lets it set up my postgresql for me + enablePostgresqlLocally = true; + + # host domain host = "chat.${config.networking.domain}"; camoKeyFile = builtins.toString config.age.secrets.zulip-camoKey.path; rabbitmqPasswordFile = builtins.toString config.age.secrets.zulip-rabbitmqPassword.path; @@ -11,11 +13,10 @@ sharedSecretKeyFile = builtins.toString config.age.secrets.zulip-sharedSecretKey.path; avatarSaltKeyFile = builtins.toString config.age.secrets.zulip-avatarSaltKey.path; zulipSettings = { - ZULIP_ADMINISTRATOR = "admin+zulip@${config.networking.domain}"; - EXTERNAL_HOST = "chat.${config.networking.domain}"; + ZULIP_ADMINISTRATOR = "zulip+admin@${config.networking.domain}"; + EXTERNAL_HOST = config.services.zulip.host; }; }; - services.postgresql.enable = true; mailserver.loginAccounts = { "zulip+admin@${config.networking.domain}" = { hashedPasswordFile = builtins.toString config.age.secrets."mailserver-acc-zulip+admin-pw".path;