fix: syntax

Author: staaldraad

ansible/tasks/setup-pgbouncer.yml

@@ -48,7 +48,7 @@
     comment: "PgBouncer user"
     groups: "postgres,ssl-cert"
     name: "pgbouncer"
-    shell: "/usr/sbin/nolign"
+    shell: "/usr/sbin/nologin"
     state: "present"
 
 - name: Create PgBouncer directories if they do not exist
@@ -114,7 +114,6 @@
     - /etc/postgresql/pg_hba.conf
     - /etc/postgresql/pg_hba_users_public.conf
     - /etc/postgresql/pg_hba_public.conf
-    - /etc/pgbouncer-custom/ssl-config.ini
   loop_control:
     loop_var: "pgbouncer_group_item"
 

nix/checks.nix

@@ -163,6 +163,7 @@
                   PGSODIUM_GETKEY = "${getkey-script}/bin/pgsodium-getkey";
                   PGSQL_DEFAULT_PORT = pgPort;
                 };
+                version = majorVersion;
               };
 
               getVersionArg =

nix/packages/lib.nix

@@ -17,7 +17,7 @@
       version,
     }:
     let
-      paths = {
+      basePaths = {
         migrationsDir = builtins.path {
           name = "migrations";
           path = ../../migrations/db;
@@ -67,7 +67,7 @@
           path = ../tests/util/pgsodium_getkey.sh;
         };
       };
-      // (
+      extraPaths =
         if version == "15" then
           {
             pgHbaConfigFile = builtins.path {
@@ -89,8 +89,8 @@
               name = "pg_hba_public.conf";
               path = ../../ansible/files/postgresql_config/pg_hba_public.conf.j2;
             };
-          }
-      );
+          };
+      paths = basePaths // extraPaths;
 
       localeArchive =
         if pkgs.stdenv.isDarwin then
@@ -155,8 +155,8 @@
           chmod 644 $out/etc/postgresql/pg_hba_users_public.conf
         ''}
         ${lib.optionalString (paths ? pgHbaPublicConfigFile) ''
-            cp ${paths.pgHbaPublicConfigFile} $out/etc/postgresql/pg_hba_public.conf || { echo "Failed to copy pg_hba_public.conf"; exit 1; }
-            chmod 644 $out/etc/postgresql/pg_hba_public.conf
+          cp ${paths.pgHbaPublicConfigFile} $out/etc/postgresql/pg_hba_public.conf || { echo "Failed to copy pg_hba_public.conf"; exit 1; }
+          chmod 644 $out/etc/postgresql/pg_hba_public.conf
         ''}
 
         cp ${paths.pgIdentConfigFile} $out/etc/postgresql/pg_ident.conf || { echo "Failed to copy pg_ident.conf"; exit 1; }

nix/tools/run-server.sh.in

@@ -34,10 +34,10 @@ start_postgres() {
         # Start the server
         pg_ctl start -D "$DATDIR" -l "$LOG_FILE" \
             -o "--config-file=$DATDIR/postgresql.conf -p $PORTNO -k $DATDIR/tmp"
-            
+
         # Give it a moment to write logs
         sleep 1
-        
+
         # Check server status and logs
         if ! pg_ctl status -D "$DATDIR"; then
             echo "PostgreSQL failed to start. Full logs:"
@@ -192,7 +192,7 @@ export LC_CTYPE=en_US.UTF-8
 export KEY_FILE="$DATDIR/pgsodium.key"
 echo "KEY_FILE: $KEY_FILE"
 echo "KEY_FILE contents:"
-cat "$KEY_FILE" 
+cat "$KEY_FILE"
 
 echo "PGSODIUM_GETKEY_SCRIPT: $PGSODIUM_GETKEY_SCRIPT"
 echo "NOTE: using port $PORTNO for server"
@@ -218,7 +218,7 @@ if [ "$VERSION" = "15" ]; then
 else
     cp "${PG_HBA_FILE}" "$DATDIR/pg_hba.conf"
     # copy extra hba_*.conf files over
-    extra_hba_files=( ${PG_HBA_FILE%pg_hba.conf}pg_hba*.conf* )
+    extra_hba_files=( ${PG_HBA_FILE%pg_hba.conf}pg_hba_*.conf* )
     for f in "${extra_hba_files[@]}"; do
         base=$(basename "$f")
         cp "$f" "$DATDIR/${base%%.conf*}.conf"
@@ -270,16 +270,16 @@ orioledb_config_items() {
         # macOS specific configuration
         echo "macOS detected, applying macOS specific configuration"
         ls -la "$DATDIR"
-        
+
         # Use perl instead of sed for macOS
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/postgresql.conf"
         perl -pi -e 's/db_user_namespace = off/#db_user_namespace = off/g' "$DATDIR/postgresql.conf"
-        
+
         perl -pi -e 's/ timescaledb,//g' "$DATDIR/supautils.conf"
         perl -pi -e 's/ plv8,//g' "$DATDIR/supautils.conf"
         perl -pi -e 's/ pgjwt,//g' "$DATDIR/supautils.conf"
         perl -pi -e 's/(shared_preload_libraries\s*=\s*'\''.*?)'\''/\1, orioledb'\''/' "$DATDIR/postgresql.conf"
-        
+
         echo "default_table_access_method = 'orioledb'" >> "$DATDIR/postgresql.conf"
     elif [[ "$VERSION" == "17" && "$CURRENT_SYSTEM" != "aarch64-darwin" ]]; then
         echo "non-macos pg 17 conf"
@@ -307,7 +307,7 @@ export GRN_PLUGINS_DIR=$GROONGA/lib/groonga/plugins
 
 # Start postgres
 mkdir -p "$DATDIR/tmp"
-chmod 1777 "$DATDIR/tmp"  
+chmod 1777 "$DATDIR/tmp"
 start_postgres "daemon"
 
 # Wait for PostgreSQL to start
@@ -387,6 +387,6 @@ stop_postgres
 # Step 4: Restart PostgreSQL in the foreground (with log output visible) or as a daemon
 if [ "$DAEMONIZE" = true ]; then
     start_postgres "daemon"
-else 
+else
     start_postgres "foreground"
 fi