From 85933e151ec416d2cc64e337ac2f49316217ac85 Mon Sep 17 00:00:00 2001 From: Adam Zimmermann Date: Tue, 8 Mar 2022 15:37:43 -0600 Subject: [PATCH 1/2] Override hash_salt when empty vs not set. https://github.com/drupal/drupal/blob/9.4.x/core/assets/scaffold/files/default.settings.php\#L252 --- web/sites/default/settings.platformsh.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sites/default/settings.platformsh.php b/web/sites/default/settings.platformsh.php index 4f1abe5..d70bdeb 100644 --- a/web/sites/default/settings.platformsh.php +++ b/web/sites/default/settings.platformsh.php @@ -108,7 +108,7 @@ // Set the project-specific entropy value, used for generating one-time // keys and such. - $settings['hash_salt'] = $settings['hash_salt'] ?? $platformsh->projectEntropy; + $settings['hash_salt'] = empty($settings['hash_salt']) ? $platformsh->projectEntropy : ''; // Set the deployment identifier, which is used by some Drupal cache systems. $settings['deployment_identifier'] = $settings['deployment_identifier'] ?? $platformsh->treeId; From 222d1c024030727ff5a39a1c6fd83b62b7dafb13 Mon Sep 17 00:00:00 2001 From: Adam Zimmermann Date: Mon, 11 Apr 2022 20:41:48 -0500 Subject: [PATCH 2/2] Alterations from PR feedback. --- web/sites/default/settings.platformsh.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sites/default/settings.platformsh.php b/web/sites/default/settings.platformsh.php index d70bdeb..1a867f9 100644 --- a/web/sites/default/settings.platformsh.php +++ b/web/sites/default/settings.platformsh.php @@ -108,7 +108,7 @@ // Set the project-specific entropy value, used for generating one-time // keys and such. - $settings['hash_salt'] = empty($settings['hash_salt']) ? $platformsh->projectEntropy : ''; + $settings['hash_salt'] = empty($settings['hash_salt']) ? $platformsh->projectEntropy : $settings['hash_salt']; // Set the deployment identifier, which is used by some Drupal cache systems. $settings['deployment_identifier'] = $settings['deployment_identifier'] ?? $platformsh->treeId;