From a7787b927265f358abfada87585490b684a747e4 Mon Sep 17 00:00:00 2001
From: Roy Dumblauskas <roydumblauskas@gmail.com>
Date: Fri, 26 Dec 2025 12:16:16 -0600
Subject: [PATCH] add port option in cas of non-standard port for psql

---
 homelab-services/postgresql-db/flake.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/homelab-services/postgresql-db/flake.nix b/homelab-services/postgresql-db/flake.nix
index 223330d..f2a8cb8 100644
--- a/homelab-services/postgresql-db/flake.nix
+++ b/homelab-services/postgresql-db/flake.nix
@@ -120,42 +120,42 @@
                 echo "Bootstrapping PostgreSQL for database: $db"
 
                 # Create databases if not exists
-                if $psql_bin -c "\l" | grep -ci ""$db" "; then
+                if $psql_bin -c --port=${opts.port} "\l" | grep -ci ""$db" "; then
                   echo "$db already exists, skipping creation."
                 else
                   echo "Creating database $db"
-                  $psql_bin -c "CREATE DATABASE "$db";"
+                  $psql_bin -c --port=${opts.port} "CREATE DATABASE "$db";"
                 fi
 
-                if $psql_bin -c "\l" | grep -ci "$db"_dev; then
+                if $psql_bin -c --port=${opts.port} "\l" | grep -ci "$db"_dev; then
                   echo ""$db"_dev already exists, skipping creation."
                 else
                   echo "Creating database "$db"_dev"
-                  $psql_bin -c "CREATE DATABASE "$db"_dev;"
+                  $psql_bin -c --port=${opts.port} "CREATE DATABASE "$db"_dev;"
                 fi
 
                 # Create users if not exists
-                if $psql_bin -c "\du" | grep -ci "$user_val"; then
+                if $psql_bin -c --port=${opts.port} "\du" | grep -ci "$user_val"; then
                   echo "$user_val already exists, skipping creation. WARN: password may not be correct. Delete user and allow to be recreated for assurity"
                 else
                   echo "Creating $user_val"
-                  $psql_bin -c "CREATE ROLE "$user_val" WITH LOGIN PASSWORD '$pass_val';"
+                  $psql_bin -c --port=${opts.port} "CREATE ROLE "$user_val" WITH LOGIN PASSWORD '$pass_val';"
                 fi
 
-                if $psql_bin -c "\du" | grep -ci "$dev_user_val"; then
+                if $psql_bin -c --port=${opts.port} "\du" | grep -ci "$dev_user_val"; then
                   echo "$dev_user_val already exists, skipping creation. WARN: password may not be correct. Delete user and allow to be recreated for assurity"
                 else
                   echo "Creating $dev_user_val"
-                  $psql_bin -c "CREATE ROLE "$dev_user_val" WITH LOGIN PASSWORD '$dev_pass_val';"
+                  $psql_bin -c --port=${opts.port} "CREATE ROLE "$dev_user_val" WITH LOGIN PASSWORD '$dev_pass_val';"
                 fi
 
                 # Give users privileges on databases (always)
-                $psql_bin -c "GRANT ALL PRIVILEGES ON DATABASE "$db" TO "$user_val";"
-                $psql_bin -c "GRANT ALL PRIVILEGES ON DATABASE "$db"_dev TO "$dev_user_val";"
+                $psql_bin -c --port=${opts.port} "GRANT ALL PRIVILEGES ON DATABASE "$db" TO "$user_val";"
+                $psql_bin -c --port=${opts.port} "GRANT ALL PRIVILEGES ON DATABASE "$db"_dev TO "$dev_user_val";"
                 
                 # Grant ownership
-                $psql_bin -c "ALTER DATABASE "$db" OWNER TO "$user_val";"
-                $psql_bin -c "ALTER DATABASE "$db"_dev OWNER TO "$dev_user_val";"
+                $psql_bin -c --port=${opts.port} "ALTER DATABASE "$db" OWNER TO "$user_val";"
+                $psql_bin -c --port=${opts.port} "ALTER DATABASE "$db"_dev OWNER TO "$dev_user_val";"
 
               done
             '';