Skip to content

Commit

Permalink
Merge pull request #353 from joshdentremont/joshdentremont-patch-1
Browse files Browse the repository at this point in the history
Update docker compose in check-secrets.sh
  • Loading branch information
aOelschlager authored Sep 6, 2023
2 parents 8b7e11c + 7d36e54 commit bce231d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/scripts/check-secrets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ function main() {
fi

# Check if Salt matches the one in secrets/live/.
SALT=$(echo $(docker-compose exec drupal with-contenv bash -lc "cat web/sites/default/settings.php | grep hash_salt | grep '^\$settings' | cut -d\= -f2| cut -d\' -f2 | cut -f1 -d\"'\" | tr -d '\n' | cut -f1 -d\"%\""))
SALT=$(echo $(docker compose exec drupal with-contenv bash -lc "cat web/sites/default/settings.php | grep hash_salt | grep '^\$settings' | cut -d\= -f2| cut -d\' -f2 | cut -f1 -d\"'\" | tr -d '\n' | cut -f1 -d\"%\""))
SETTINGS_SALT=$(echo $(cat secrets/live/DRUPAL_DEFAULT_SALT | tr -d '\n' | cut -f1 -d"%"))
if [[ $(echo "${SALT}") != $(echo "${SETTINGS_SALT}") ]]; then
echo "${SALT} ${SETTINGS_SALT} Updates to the salt are not automatically added to web/sites/default/settings.php file. Please make this change manually and then run the same ${BLUE}make down && make up${RESET} command again."
Expand All @@ -177,4 +177,4 @@ fi

main
print_security_warning
echo -e "\nCheck secrets is ${GREEN}done${RESET}.\n\n"
echo -e "\nCheck secrets is ${GREEN}done${RESET}.\n\n"

0 comments on commit bce231d

Please sign in to comment.