From f9908ec19a437a63beda43eeea5a5cf0bcea749f Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Tue, 7 Feb 2023 10:40:43 -0700 Subject: [PATCH 1/3] Load boilerplate acquia settings before project custom acquia settings This helps to ensure that project-specific settings that rely on OOTB acquia settings can be used and aren't overwritten --- docroot/sites/default/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/sites/default/settings.php b/docroot/sites/default/settings.php index b1b18c2..ae59592 100755 --- a/docroot/sites/default/settings.php +++ b/docroot/sites/default/settings.php @@ -82,8 +82,8 @@ // Acquia if (getenv('AH_SITE_GROUP') && file_exists(__DIR__ . '/settings.acquia.php')) { - include __DIR__ . '/settings.acquia-custom.php'; include __DIR__ . '/settings.acquia.php'; + include __DIR__ . '/settings.acquia-custom.php'; } // Pantheon From ac4e1a37f81a0fe92bca7a9a1b2bd337984601f0 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Tue, 7 Feb 2023 10:41:31 -0700 Subject: [PATCH 2/3] Load boilerplate pantheon settings before custom pantheon settings This helps to ensure that project-specific settings that rely on OOTB pantheon settings can be used and aren't overwritten --- docroot/sites/default/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/sites/default/settings.php b/docroot/sites/default/settings.php index ae59592..f1ba942 100755 --- a/docroot/sites/default/settings.php +++ b/docroot/sites/default/settings.php @@ -88,8 +88,8 @@ // Pantheon if (getenv('PANTHEON_ENVIRONMENT') && file_exists(__DIR__ . '/settings.pantheon.php')) { - include __DIR__ . '/settings.pantheon-custom.php'; include __DIR__ . '/settings.pantheon.php'; + include __DIR__ . '/settings.pantheon-custom.php'; } // Platform.sh From 74fc58ea456d86dd617665c48bf3bc7f38c7d059 Mon Sep 17 00:00:00 2001 From: Jes Constantine Date: Tue, 7 Feb 2023 10:42:09 -0700 Subject: [PATCH 3/3] Load boilerplate platformsh settings before custom platformsh settings This helps to ensure that project-specific settings that rely on OOTB platformsh settings can be used and aren't overwritten --- docroot/sites/default/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/sites/default/settings.php b/docroot/sites/default/settings.php index f1ba942..0291924 100755 --- a/docroot/sites/default/settings.php +++ b/docroot/sites/default/settings.php @@ -94,8 +94,8 @@ // Platform.sh if (getenv('PLATFORM_APPLICATION') && file_exists(__DIR__ . '/settings.platform.php')) { - include __DIR__ . '/settings.platform-custom.php'; include __DIR__ . '/settings.platform.php'; + include __DIR__ . '/settings.platform-custom.php'; } /**