Merge pull request #1169 from flyingcircusio/PL-133170-fix-postgres-t…

…ests fix postgres tests and remove eol postgresql12
flyingcircusio · Nov 26, 2024 · 732e692 · 732e692
2 parents cf3dd4b + 4e4b37f
commit 732e692
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/changelog.d/20241117_230848_HEAD_scriv.md b/changelog.d/20241117_230848_HEAD_scriv.md
@@ -0,0 +1,20 @@
+<!--
+
+A new changelog entry.
+
+Delete placeholder items that do not apply. Empty sections will be removed
+automatically during release.
+
+Leave the XX.XX as is: this is a placeholder and will be automatically filled
+correctly during the release and helps when backporting over multiple platform
+branches.
+
+-->
+
+### Impact
+
+- Remove the postgresql12 role
+
+### NixOS XX.XX platform
+
+- Remove the postgresql12 role
diff --git a/nixos/roles/postgresql.nix b/nixos/roles/postgresql.nix
@@ -14,7 +14,6 @@ in
 
   in {
     flyingcircus.roles = {
-      postgresql12 = mkRole "12";
       postgresql13 = mkRole "13";
       postgresql14 = mkRole "14";
       postgresql15 = mkRole "15";
@@ -26,7 +25,6 @@ in
   config =
   let
     pgroles = with config.flyingcircus.roles; {
-      "12" = postgresql12.enable;
       "13" = postgresql13.enable;
       "14" = postgresql14.enable;
       "15" = postgresql15.enable;

diff --git a/nixos/services/postgresql/default.nix b/nixos/services/postgresql/default.nix
@@ -167,6 +167,7 @@ in {
 
       systemd.services.postgresql.serviceConfig = {
         Restart = "always";
+        ReadWritePaths = [ "/nix/var/nix/gcroots/per-user/postgres" ];
       } // lib.optionalAttrs (lib.versionAtLeast cfg.majorVersion "12") {
         RuntimeDirectory = "postgresql";
       };
@@ -211,7 +212,7 @@ in {
 
       flyingcircus.activationScripts = {
         postgresql-srv = lib.stringAfter [ "users" "groups" ] ''
-          install -d -o postgres /srv/postgresql
+          install -d -o postgres /srv/postgresql/${cfg.majorVersion}
           install -d -o postgres /nix/var/nix/gcroots/per-user/postgres
         '';
       };

diff --git a/release/important_packages.json b/release/important_packages.json
@@ -156,21 +156,18 @@
   "polkit",
   "postfix",
   "postgresqlPackages.postgis",
-  "postgresql12Packages.postgis",
   "postgresql13Packages.postgis",
   "postgresql14Packages.postgis",
   "postgresql15Packages.postgis",
   "postgresql16Packages.postgis",
   "postgresql17Packages.postgis",
   "postgresqlPackages.temporal_tables",
-  "postgresql12Packages.temporal_tables",
   "postgresql13Packages.temporal_tables",
   "postgresql14Packages.temporal_tables",
   "postgresql15Packages.temporal_tables",
   "postgresql16Packages.temporal_tables",
   "postgresql17Packages.temporal_tables",
   "postgresql",
-  "postgresql_12",
   "postgresql_13",
   "postgresql_14",
   "postgresql_15",