From 9e11d15be95d097790eea90ba49fdc6ee199db8d Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 29 Nov 2023 01:56:51 +0700 Subject: [PATCH] server/maubot: move impermanence config to impermanence module --- system/hosts/server/maubot.nix | 3 --- system/modules/impermanence.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/system/hosts/server/maubot.nix b/system/hosts/server/maubot.nix index ea50a16..e34a2aa 100644 --- a/system/hosts/server/maubot.nix +++ b/system/hosts/server/maubot.nix @@ -6,9 +6,6 @@ let cfg = config.server; in { - impermanence.directories = [ - { directory = /var/lib/maubot; user = "maubot"; group = "maubot"; mode = "0755"; } - ]; services.nginx.virtualHosts."matrix.${cfg.domainName}".locations = let inherit (config.services.maubot) settings; in { diff --git a/system/modules/impermanence.nix b/system/modules/impermanence.nix index a1d5be9..3d2fbe3 100644 --- a/system/modules/impermanence.nix +++ b/system/modules/impermanence.nix @@ -93,6 +93,8 @@ in { { directory = /var/lib/hydra; user = "hydra"; group = "hydra"; mode = "0755"; } ] ++ lib.optionals config.services.matrix-synapse.enable [ { directory = /var/lib/matrix-synapse; user = "matrix-synapse"; group = "matrix-synapse"; mode = "0700"; } + ] ++ lib.optionals config.services.maubot.enable [ + { directory = /var/lib/maubot; user = "maubot"; group = "maubot"; mode = "0750"; } ] ++ lib.optionals config.services.monero.enable [ { directory = config.services.monero.dataDir; user = "monero"; group = "monero"; mode = "0750"; } ] ++ lib.optionals config.services.mullvad-vpn.enable [