Move certificate details back to environment file

pull/544/head
Mikhael Rakauskas 4 months ago
parent c5c9460a59
commit df815d52d9

@ -1,7 +1,7 @@
DB_HOST= DB_HOST=
DB_POOL=25 DB_POOL=25
DB_PORT=5432 DB_PORT=5432
DB_SSLCERT= DB_SSLCERT=/config/rds-combined-ca-bundle.pem
DB_SSLMODE=verify-full DB_SSLMODE=verify-full
REDIS_URL= REDIS_URL=
PORT=3000 PORT=3000

@ -123,10 +123,9 @@ fetch_env_variables() {
export DB_HOST=$(echo "$SECRET_JSON" | jq -r '.host') export DB_HOST=$(echo "$SECRET_JSON" | jq -r '.host')
export REDIS_URL=$(echo "$SECRET_JSON" | jq -r '.redis_url') export REDIS_URL=$(echo "$SECRET_JSON" | jq -r '.redis_url')
export S3_ATTACHMENTS_BUCKET=$(echo "$SECRET_JSON" | jq -r '.s3_attachments_bucket') export S3_ATTACHMENTS_BUCKET=$(echo "$SECRET_JSON" | jq -r '.s3_attachments_bucket')
export DB_SSLCERT=$(echo "$SECRET_JSON" | jq -r '.ssl_cert_location')
# Validate that we got the values # Validate that we got the values
if [ "$DB_HOST" = "null" ] || [ "$REDIS_URL" = "null" ] || [ "$S3_ATTACHMENTS_BUCKET" = "null" ] || [ "$DB_SSLCERT" = "null" ] || [ -z "$DB_HOST" ] || [ -z "$REDIS_URL" ] || [ -z "$S3_ATTACHMENTS_BUCKET" ] || [ -z "$DB_SSLCERT" ]; then if [ "$DB_HOST" = "null" ] || [ "$REDIS_URL" = "null" ] || [ "$S3_ATTACHMENTS_BUCKET" = "null" ] || [ -z "$DB_HOST" ] || [ -z "$REDIS_URL" ] || [ -z "$S3_ATTACHMENTS_BUCKET" ]; then
echo "ERROR: Failed to parse variables from secrets" echo "ERROR: Failed to parse variables from secrets"
echo "Expected JSON format: {\"key\": \"...\", ...}" echo "Expected JSON format: {\"key\": \"...\", ...}"
exit 1 exit 1
@ -141,7 +140,6 @@ fetch_env_variables() {
grep -v "^DB_HOST=" ./.env.staging > ./.env.staging.tmp || true grep -v "^DB_HOST=" ./.env.staging > ./.env.staging.tmp || true
grep -v "^REDIS_URL=" ./.env.staging.tmp > ./.env.staging || true grep -v "^REDIS_URL=" ./.env.staging.tmp > ./.env.staging || true
grep -v "^S3_ATTACHMENTS_BUCKET=" ./.env.staging.tmp > ./.env.staging || true grep -v "^S3_ATTACHMENTS_BUCKET=" ./.env.staging.tmp > ./.env.staging || true
grep -v "^DB_SSLCERT=" ./.env.staging.tmp > ./.env.staging || true
rm -f ./.env.staging.tmp rm -f ./.env.staging.tmp
fi fi
@ -149,7 +147,6 @@ fetch_env_variables() {
echo "DB_HOST=$DB_HOST" >> ./.env.staging echo "DB_HOST=$DB_HOST" >> ./.env.staging
echo "REDIS_URL=$REDIS_URL" >> ./.env.staging echo "REDIS_URL=$REDIS_URL" >> ./.env.staging
echo "S3_ATTACHMENTS_BUCKET=$S3_ATTACHMENTS_BUCKET" >> ./.env.staging echo "S3_ATTACHMENTS_BUCKET=$S3_ATTACHMENTS_BUCKET" >> ./.env.staging
echo "DB_SSLCERT=$DB_SSLCERT" >> ./.env.staging
echo "✓ Environment variables successfully retrieved and written to .env.staging" echo "✓ Environment variables successfully retrieved and written to .env.staging"
} }

Loading…
Cancel
Save