Merge pull request #262 from molybdenumsoftware/postgresql-target

chore(flake): postgresql.service -> postgresql.target

Author: jfly

flake.lock

@@ -69,8 +69,8 @@
         systemd.services.pr-tracker-api.wantedBy = [ "multi-user.target" ];
         systemd.services.pr-tracker-api.after = [
           "network.target"
-        ] ++ lib.optional cfg.db.isLocal "postgresql.service";
-        systemd.services.pr-tracker-api.bindsTo = lib.optional cfg.db.isLocal "postgresql.service";
+        ] ++ lib.optional cfg.db.isLocal "postgresql.target";
+        systemd.services.pr-tracker-api.bindsTo = lib.optional cfg.db.isLocal "postgresql.target";
 
         systemd.services.pr-tracker-api.script = lib.concatLines (
           [

modules/api/nixos-module.nix

@@ -92,8 +92,8 @@
         systemd.services.pr-tracker-fetcher.description = "pr-tracker-fetcher";
         systemd.services.pr-tracker-fetcher.after = [
           "network.target"
-        ] ++ lib.optional cfg.db.isLocal "postgresql.service";
-        systemd.services.pr-tracker-fetcher.requires = lib.optional cfg.db.isLocal "postgresql.service";
+        ] ++ lib.optional cfg.db.isLocal "postgresql.target";
+        systemd.services.pr-tracker-fetcher.requires = lib.optional cfg.db.isLocal "postgresql.target";
         systemd.services.pr-tracker-fetcher.script = lib.concatLines (
           [
             "export ${fetcher.environmentVariables.PR_TRACKER_FETCHER_DATABASE_URL.name}=${lib.escapeShellArg "postgresql://?${attrsToURLParams cfg.db.urlParams}"}"

modules/fetcher/nixos-module.nix

@@ -95,9 +95,9 @@
         {
           config = mkIf (cfg.db.createLocally && hasAttr program cfg && programCfg.enable) {
             services.postgresql.ensureUsers = [ { name = programCfg.user; } ];
-            systemd.services.postgresql.postStart = lib.mkAfter ''
-              $PSQL '${cfg.db.name}' -c 'GRANT "${cfg.db.name}" TO "${programCfg.user}"'
-              $PSQL '${cfg.db.name}' -c 'ALTER DEFAULT PRIVILEGES FOR ROLE "${programCfg.user}" IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO "${cfg.db.name}"'
+            systemd.services.postgresql-setup.postStart = ''
+              psql '${cfg.db.name}' -c 'GRANT "${cfg.db.name}" TO "${programCfg.user}"'
+              psql '${cfg.db.name}' -c 'ALTER DEFAULT PRIVILEGES FOR ROLE "${programCfg.user}" IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO "${cfg.db.name}"'
             '';
           };
         }