diff --git a/modules/crans/default.nix b/modules/crans/default.nix index 2dab786..4f28495 100644 --- a/modules/crans/default.nix +++ b/modules/crans/default.nix @@ -14,7 +14,6 @@ in { imports = [ ./age.nix - ./anubis.nix ./grub.nix ./home.nix ./locale.nix diff --git a/modules/crans/anubis.nix b/modules/services/anubis.nix similarity index 95% rename from modules/crans/anubis.nix rename to modules/services/anubis.nix index 09ed2de..9348b13 100644 --- a/modules/crans/anubis.nix +++ b/modules/services/anubis.nix @@ -72,7 +72,7 @@ in let redCfg = config.services.redis.servers.anubis; in - { + mkIf cfg.useRedis { backend = "valkey"; parameters.url = "redis://${redCfg.bind}:${toString redCfg.port}/0"; }; @@ -99,7 +99,8 @@ in } ] ++ conf.bots; - # Inclus via l’import de default-config.yaml. + # Inclus via l’import de default-config.yaml. Et on préfére mettre le + # whitelist Crans avant. useDefaultBotRules = false; }; settings = { @@ -122,7 +123,7 @@ in # Meilleure licence que Redis package = pkgs.valkey; servers.anubis = { - enable = true; + enable = cfg.useRedis; bind = "127.0.0.1"; port = 6379; databases = 1; diff --git a/modules/services/default.nix b/modules/services/default.nix index 2b1115a..97bfe4a 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -3,6 +3,7 @@ { imports = [ ./acme.nix + ./anubis.nix ./nginx.nix ./restic.nix ./reverseproxy.nix diff --git a/modules/services/reverseproxy.nix b/modules/services/reverseproxy.nix index fb64fd0..e3dc5c3 100644 --- a/modules/services/reverseproxy.nix +++ b/modules/services/reverseproxy.nix @@ -154,6 +154,7 @@ in # On active Anubis crans.anubis = { enable = true; + useRedis = true; instances = lib.mapAttrs (vhostName: vhostConfig: { hostname = mkHostName vhostName mainTld; bind = "/run/anubis/anubis-${vhostName}/socket.sock";