From 2b8341ea9c190cf83e2cbf9d34aa2e37b15f3783 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:31:24 +0100
Subject: [PATCH 1/3] services: fail2ban: migrate to new options

---
 services/fail2ban.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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";
     };
   };
 }

From 39f85191b11be77e67201ea7c01ac725e1b7b74d Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:41:12 +0100
Subject: [PATCH 2/3] services: gitea: adapt to 23.11 postgres changes

---
 services/gitea/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 = {

From 35b5d69f14fcc9b110156b4d4366dc46d2e1f22d Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:41:25 +0100
Subject: [PATCH 3/3] services: nextcloud: remove deprecated option

---
 services/nextcloud.nix | 2 --
 1 file changed, 2 deletions(-)

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;