Merge pull request #1 from bcaton85/fips-upgrade-minor-fixes

minor fixes
quay · Nov 8, 2024 · cfc1c8b · cfc1c8b
2 parents b6f0b9d + 25634ac
commit cfc1c8b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml b/kustomize/components/clairpgupgrade/base/clair-pg-old.deployment.yaml
@@ -65,12 +65,11 @@ spec:
                     echo 'Waiting for PostgreSQL to start...';
                     sleep 2;
                   done;
-                  if [ \"\$(cat /proc/sys/crypto/fips_enabled)\" -eq 1 ]; then
+                  if [[ -f /proc/sys/crypto/fips_enabled && $(< /proc/sys/crypto/fips_enabled) -eq 1 ]]; then
                     echo 'password_encryption = scram-sha-256' >> $PGDATA/postgresql.conf;
                     echo 'host all all 0.0.0.0/0 scram-sha-256' >> $PGDATA/pg_hba.conf;
                     pg_ctl reload;
                     psql -c \"ALTER SYSTEM SET password_encryption TO 'scram-sha-256';\";
                     psql -c \"SELECT pg_reload_conf();\";
                     psql -c \"ALTER USER $POSTGRESQL_USER WITH PASSWORD '$POSTGRESQL_PASSWORD';\";
-                  fi
-                "]
+                  fi"]