diff --git a/modules/nixos/services/aria/default.nix b/modules/nixos/services/aria/default.nix index 227cbac..4946663 100644 --- a/modules/nixos/services/aria/default.nix +++ b/modules/nixos/services/aria/default.nix @@ -69,10 +69,7 @@ in }; }; - my.system.persist.directories = [ - cfg.downloadDir - config.users.users.aria2.home - ]; + # FIXME: persistence? # NOTE: unfortunately aria2 does not log connection failures for fail2ban }; diff --git a/modules/nixos/services/audiobookshelf/default.nix b/modules/nixos/services/audiobookshelf/default.nix index 5e79990..9985a26 100644 --- a/modules/nixos/services/audiobookshelf/default.nix +++ b/modules/nixos/services/audiobookshelf/default.nix @@ -34,9 +34,7 @@ in }; }; - my.system.persist.directories = [ - "/var/lib/${config.services.audiobookshelf.dataDir}" - ]; + # FIXME: persistence? services.fail2ban.jails = { audiobookshelf = '' diff --git a/modules/nixos/services/fail2ban/default.nix b/modules/nixos/services/fail2ban/default.nix index a40e03e..efb07c9 100644 --- a/modules/nixos/services/fail2ban/default.nix +++ b/modules/nixos/services/fail2ban/default.nix @@ -34,8 +34,6 @@ in }; }; - my.system.persist.directories = [ - "/var/lib/${config.systemd.services.fail2ban.serviceConfig.StateDirectory}" - ]; + # FIXME: persistence? }; } diff --git a/modules/nixos/services/flood/default.nix b/modules/nixos/services/flood/default.nix index b4fecef..23154ed 100644 --- a/modules/nixos/services/flood/default.nix +++ b/modules/nixos/services/flood/default.nix @@ -28,9 +28,7 @@ in }; }; - my.system.persist.directories = [ - "/var/lib/${config.systemd.services.flood.serviceConfig.StateDirectory}" - ]; + # FIXME: persistence? # NOTE: unfortunately flood does not log connection failures for fail2ban }; diff --git a/modules/nixos/services/grocy/default.nix b/modules/nixos/services/grocy/default.nix index 57295f1..67de377 100644 --- a/modules/nixos/services/grocy/default.nix +++ b/modules/nixos/services/grocy/default.nix @@ -37,15 +37,8 @@ in useACMEHost = config.networking.domain; }; - my.services.backup = { - paths = [ - config.services.grocy.dataDir - ]; - }; - - my.system.persist.directories = [ - config.services.grocy.dataDir - ]; + # FIXME: backup + # FIXME: persistence # NOTE: unfortunately grocy does not log connection failures for fail2ban }; diff --git a/modules/nixos/services/komga/default.nix b/modules/nixos/services/komga/default.nix index 15e4fbb..9412573 100644 --- a/modules/nixos/services/komga/default.nix +++ b/modules/nixos/services/komga/default.nix @@ -36,9 +36,7 @@ in }; }; - my.system.persist.directories = [ - config.services.komga.stateDir - ]; + # FIXME: persistence? services.fail2ban.jails = { komga = '' diff --git a/modules/nixos/services/mealie/default.nix b/modules/nixos/services/mealie/default.nix index 7d3fd96..4eb6977 100644 --- a/modules/nixos/services/mealie/default.nix +++ b/modules/nixos/services/mealie/default.nix @@ -72,15 +72,8 @@ in }; }; - my.services.backup = { - paths = [ - "/var/lib/${config.systemd.services.mealie.serviceConfig.StateDirectory}" - ]; - }; - - my.system.persist.directories = [ - "/var/lib/${config.systemd.services.mealie.serviceConfig.StateDirectory}" - ]; + # FIXME: backup + # FIXME: persistence services.fail2ban.jails = { mealie = '' diff --git a/modules/nixos/services/miniflux/default.nix b/modules/nixos/services/miniflux/default.nix index 400ae00..7bcfe30 100644 --- a/modules/nixos/services/miniflux/default.nix +++ b/modules/nixos/services/miniflux/default.nix @@ -49,6 +49,9 @@ in }; }; + # FIXME: backup + # FIXME: persistence + services.fail2ban.jails = { miniflux = '' enabled = true diff --git a/modules/nixos/services/pdf-edit/default.nix b/modules/nixos/services/pdf-edit/default.nix index 1eb900d..73527d9 100644 --- a/modules/nixos/services/pdf-edit/default.nix +++ b/modules/nixos/services/pdf-edit/default.nix @@ -54,9 +54,7 @@ in }; }; - my.system.persist.directories = [ - "/var/lib/${systemd.services.stirling-pdf.serviceConfig.StateDirectory}" - ]; + # FIXME: persistence? services.fail2ban.jails = { stirling-pdf = '' diff --git a/modules/nixos/services/pyload/default.nix b/modules/nixos/services/pyload/default.nix index a8ec3b2..1167509 100644 --- a/modules/nixos/services/pyload/default.nix +++ b/modules/nixos/services/pyload/default.nix @@ -53,10 +53,8 @@ in }; }; - my.system.persist.directories = [ - cfg.downloadDirectory - "/var/lib/${config.systemd.services.pyload.StateDirectory}" - ]; + # FIXME: backup + # FIXME: persistence services.fail2ban.jails = { pyload = '' diff --git a/modules/nixos/services/servarr/default.nix b/modules/nixos/services/servarr/default.nix index 3330b0f..9cb2a59 100644 --- a/modules/nixos/services/servarr/default.nix +++ b/modules/nixos/services/servarr/default.nix @@ -20,15 +20,10 @@ let group = "media"; }; - my.system.persist.directories = - let - # Bazarr breaks the mold unfortunately - dataDir = - if service != "bazarr" - then config.services.${service}.dataDir - else config.users.user.${service}.home; - in - [ dataDir ]; + # Thankfully those old style services all define users with homes + my.system.persist.directories = [ + config.users.user.${service}.home + ]; }; mkRedirection = service: { diff --git a/modules/nixos/services/tandoor-recipes/default.nix b/modules/nixos/services/tandoor-recipes/default.nix index ea45e74..6282769 100644 --- a/modules/nixos/services/tandoor-recipes/default.nix +++ b/modules/nixos/services/tandoor-recipes/default.nix @@ -83,18 +83,8 @@ in }; }; - my.services.backup = { - paths = [ - "/var/lib/${config.systemd.services.tandoor-recipes.StateDirectory}" - config.systemd.services.tandoor-recipes.environment.MEDIA_ROOT - ]; - }; - - my.system.persist.directories = [ - "/var/lib/${config.systemd.services.tandoor-recipes.StateDirectory}" - config.systemd.services.tandoor-recipes.environment.MEDIA_ROOT - ]; - + # FIXME: backup + # FIXME: persistence # NOTE: unfortunately tandoor-recipes does not log connection failures for fail2ban }; diff --git a/modules/nixos/services/vikunja/default.nix b/modules/nixos/services/vikunja/default.nix index d902449..575ddab 100644 --- a/modules/nixos/services/vikunja/default.nix +++ b/modules/nixos/services/vikunja/default.nix @@ -100,9 +100,7 @@ in ]; }; - my.system.persist.directories = [ - config.services.vikunja.settings.files.basepath - ]; + # FIXME: persistence # NOTE: unfortunately vikunja does not log connection failures for fail2ban };