machines/compute01/_configuration.nix

@@ -20,7 +20,6 @@ lib.extra.mkConfig {
     "nextcloud"
     "outline"
     "plausible"
-    "postgresql"
     "rstudio-server"
     "satosa"
     "signald"

machines/compute01/postgresql.nix

@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-
-{
-  services.postgresql = {
-    enable = true;
-
-    package = pkgs.postgresql_16;
-
-    settings = {
-      checkpoint_completion_target = 0.90625;
-      default_statistics_target = 100;
-      effective_cache_size = "32GB";
-      effective_io_concurrency = 200;
-      maintenance_work_mem = "2GB";
-      max_connections = 500;
-      max_parallel_maintenance_workers = 4;
-      max_parallel_workers = 12;
-      max_parallel_workers_per_gather = 4;
-      max_wal_size = "4GB";
-      max_worker_processes = 12;
-      min_wal_size = "1GB";
-      random_page_cost = 1.125;
-      shared_buffers = "16GB";
-      wal_buffers = "16MB";
-      work_mem = "83886kB";
-    };
-  };
-
-  dgn-console = {
-    # Update the versions below for upgrading
-    pg-upgrade-to = pkgs.postgresql_16.withPackages (ps: [ ps.postgis ]);
-    pg-upgrade-from = pkgs.postgresql_16.withPackages (ps: [ ps.postgis ]);
-  };
-}

modules/dgn-console.nix

@@ -16,11 +16,6 @@ in
       default = true;
     };
 
-    pg-upgrade-from = mkOption {
-      type = lib.types.package;
-      default = config.services.postgresql.package;
-    };
-
     pg-upgrade-to = mkOption {
       type = lib.types.package;
       default = pkgs.postgresql_15;
@@ -81,18 +76,20 @@ in
         mtr
         tcpdump
       ])
-      ++ [ config.boot.kernelPackages.perf ]
+      ++ lib.optional
-      ++ lib.optional (config.services.postgresql.enable && cfg.pg-upgrade-from != cfg.pg-upgrade-to) (
+        (config.services.postgresql.enable && config.services.postgresql.package != cfg.pg-upgrade-to)
+        (
           pkgs.writeScriptBin "upgrade-pg-cluster" ''
             set -eux
             # XXX it's perhaps advisable to stop all services that depend on postgresql
             systemctl stop postgresql
 
             export NEWDATA="/var/lib/postgresql/${cfg.pg-upgrade-to.psqlSchema}"
+
             export NEWBIN="${cfg.pg-upgrade-to}/bin"
 
             export OLDDATA="${config.services.postgresql.dataDir}"
-          export OLDBIN="${cfg.pg-upgrade-from}/bin"
+            export OLDBIN="${config.services.postgresql.package}/bin"
 
             install -d -m 0700 -o postgres -g postgres "$NEWDATA"
             cd "$NEWDATA"