From 260ddbe7a81daaf83eea3f7dbb067f4857988213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 27 Sep 2023 00:01:22 +0200
Subject: [PATCH] Update more postgres'

---
 flake.lock                  |  6 +++---
 hosts/buzzrelay/default.nix |  2 +-
 hosts/hydra/default.nix     |  2 +-
 hosts/mastodon/default.nix  |  4 ++--
 hosts/matrix/default.nix    |  2 +-
 hosts/mediawiki/default.nix | 10 +---------
 hosts/mobilizon/default.nix |  2 +-
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index fcf90817..9abed3c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -362,11 +362,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1695761384,
-        "narHash": "sha256-68xqUTcwmrzterRKkI7vY7JiLwlsP6fz4ECwR6k8Nkk=",
+        "lastModified": 1695763855,
+        "narHash": "sha256-VGu/Qh02WCzXsZCBTj/+7Z8xDAOFup0nzZmn68a1PxI=",
         "owner": "SuperSandro2000",
         "repo": "nixpkgs",
-        "rev": "b369ef44c6d7ecf323099cbdb59d4a7baaeff5e9",
+        "rev": "01d71dc737b6d0434d78ac78b4d698ab14193585",
         "type": "github"
       },
       "original": {
diff --git a/hosts/buzzrelay/default.nix b/hosts/buzzrelay/default.nix
index 2e89219c..cd68abcf 100644
--- a/hosts/buzzrelay/default.nix
+++ b/hosts/buzzrelay/default.nix
@@ -44,7 +44,7 @@
     };
 
     postgresql = {
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       settings.log_min_duration_statement = 50;
       upgrade.stopServices = [ "buzzrelay" ];
       ensureUsers = [ {
diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index c0b9a1d6..29216d65 100644
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@@ -278,7 +278,7 @@ in
     portunus.addToHosts = true;
 
     postgresql = {
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "hydra-evaluator" "hydra-queue-runner" "hydra-server" ];
     };
 
diff --git a/hosts/mastodon/default.nix b/hosts/mastodon/default.nix
index a61c1f3c..b7072517 100644
--- a/hosts/mastodon/default.nix
+++ b/hosts/mastodon/default.nix
@@ -151,8 +151,8 @@
           "DATABASE \"${config.services.mastodon.database.name}\"" = "ALL PRIVILEGES";
         };
       }];
-      package = pkgs.postgresql_15;
-      upgrade.stopServices = [ "mastodon-sidekiq" "mastodon-streaming" "mastodon-web" ];
+      package = pkgs.postgresql_16;
+      upgrade.stopServices = [ "mastodon-sidekiq-all" "mastodon-streaming" "mastodon-web" ];
     };
   };
 
diff --git a/hosts/matrix/default.nix b/hosts/matrix/default.nix
index f65a3305..3d8efbd6 100644
--- a/hosts/matrix/default.nix
+++ b/hosts/matrix/default.nix
@@ -106,7 +106,7 @@
           LC_COLLATE = "C"
           LC_CTYPE = "C";
       '';
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "matrix-synapse" ];
     };
   };
diff --git a/hosts/mediawiki/default.nix b/hosts/mediawiki/default.nix
index 640eae20..0d3e983e 100644
--- a/hosts/mediawiki/default.nix
+++ b/hosts/mediawiki/default.nix
@@ -194,20 +194,12 @@ in
 
     postgresql = {
       enable = true;
-      # authentication = lib.mkForce ''
-      #   # TYPE  DATABASE        USER            ADDRESS                 METHOD
-      #   local   all             all                                     trust
-      #   host    all             all             127.0.0.1/32            trust
-      #   host    all             all             10.233.2.1/32           trust
-      #   host    all             all             ::1/128                 trust
-      # '';
-      # enableTCPIP = true;
       ensureDatabases = [ cfg.database.name ];
       ensureUsers = [{
         name = cfg.database.user;
         ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
       }];
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "httpd" "phpfpm-mediawiki" ];
     };
   };
diff --git a/hosts/mobilizon/default.nix b/hosts/mobilizon/default.nix
index 5e1f2d15..d4b9086d 100644
--- a/hosts/mobilizon/default.nix
+++ b/hosts/mobilizon/default.nix
@@ -80,7 +80,7 @@
     portunus.addToHosts = true;
 
     postgresql = {
-      package = pkgs.postgresql_15;
+      package = pkgs.postgresql_16;
       upgrade.stopServices = [ "mobilizon" ];
     };
   };