diff --git a/services/fail2ban.nix b/services/fail2ban.nix index 0f368c4..6cb1bda 100644 --- a/services/fail2ban.nix +++ b/services/fail2ban.nix @@ -19,11 +19,9 @@ in { config = mkIf cfg.enable { services.fail2ban = { enable = true; + bantime = "6h"; bantime-increment.enable = true; - jails.DEFAULT = '' - bantime = 6h - findtime = 6h - ''; + jails.DEFAULT.settings.findtime = "6h"; }; }; } diff --git a/services/gitea/default.nix b/services/gitea/default.nix index 21c9c43..b8e3e0f 100644 --- a/services/gitea/default.nix +++ b/services/gitea/default.nix @@ -85,6 +85,8 @@ in { type = "postgres"; # user needs to be the same as gitea user user = giteaUser; + # FIXME: change database name to match 23.11 postgres changes around ensureDatabase + createDatabase = false; }; }; @@ -102,7 +104,7 @@ in { # NOTE: no need to use postgresql.ensureDatabases because the gitea module # takes care of this automatically services.postgresqlBackup = { - databases = ["gitea"]; + databases = [config.services.gitea.database.name]; }; services.nginx = { diff --git a/services/nextcloud.nix b/services/nextcloud.nix index 9d34899..3f964c2 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -62,8 +62,6 @@ in { services.nextcloud = { enable = true; - enableBrokenCiphersForSSE = false; - hostName = "cloud.${domain}"; https = true; package = pkgs.nextcloud26;