From 8444f16432e41a9e74cc4e672787568dfd7aa8cb Mon Sep 17 00:00:00 2001
From: Mike Decker <pookmish@stanford.edu>
Date: Thu, 23 Jan 2025 12:31:12 -0800
Subject: [PATCH] Fixed default directory config sync path with global settings

---
 docroot/sites/settings/early.settings.php  | 25 -------------------
 docroot/sites/settings/global.settings.php | 29 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 docroot/sites/settings/global.settings.php

diff --git a/docroot/sites/settings/early.settings.php b/docroot/sites/settings/early.settings.php
index 3ea9ca42e..857cf7205 100755
--- a/docroot/sites/settings/early.settings.php
+++ b/docroot/sites/settings/early.settings.php
@@ -7,25 +7,7 @@
 
 use Acquia\Blt\Robo\Common\EnvironmentDetector;
 
-// When the encryption environment variable is not provided (local/ci/etc),
-// fake the encryption string so that the site doesn't break.
-if (!getenv('STANFORD_ENCRYPT')) {
-  putenv("STANFORD_ENCRYPT=" . substr(file_get_contents("$repo_root/salt.txt"), 0, 32));
-}
-
-/**
- * An example global include file.
- *
- * To use this file, rename to global.settings.php.
- */
-
-$settings['file_temp_path'] = '/tmp';
-
 if (EnvironmentDetector::isAhEnv()) {
-  // Set the temp directory as per https://docs.acquia.com/acquia-cloud/manage/files/broken/
-  $settings['file_temp_path'] = '/mnt/gfs/' . EnvironmentDetector::getAhGroup() . '.' . EnvironmentDetector::getAhEnv() . '/tmp';
-  $settings['letsencrypt_challenge_directory'] = $settings['file_temp_path'];
-
   // Lock the UI to read_only when on production or test in Acquia.
   if (
     (EnvironmentDetector::isAhProdEnv() || EnvironmentDetector::isAhStageEnv())
@@ -43,13 +25,6 @@
   }
 }
 
-/**
- * This can be overridden for individual sites. Add or modify this value in
- * `docroot/sites/{site-name}/settings/includes.settings.php` for the respective
- * site. See related information below.
- */
-$settings['config_sync_directory'] = DRUPAL_ROOT . '/profiles/custom/stanford_profile/config/sync';
-
 /**
  * Include settings files in docroot/sites/settings.
  *
diff --git a/docroot/sites/settings/global.settings.php b/docroot/sites/settings/global.settings.php
new file mode 100644
index 000000000..24baa49eb
--- /dev/null
+++ b/docroot/sites/settings/global.settings.php
@@ -0,0 +1,29 @@
+<?php
+
+use Acquia\Blt\Robo\Common\EnvironmentDetector;
+
+/**
+ * This can be overridden for individual sites. Add or modify this value in
+ * `docroot/sites/{site-name}/settings/includes.settings.php` for the respective
+ * site. See related information below.
+ */
+$settings['config_sync_directory'] = DRUPAL_ROOT . '/profiles/custom/stanford_profile/config/sync';
+
+// When the encryption environment variable is not provided (local/ci/etc),
+// fake the encryption string so that the site doesn't break.
+if (!getenv('STANFORD_ENCRYPT')) {
+  putenv("STANFORD_ENCRYPT=" . substr(file_get_contents("$repo_root/salt.txt"), 0, 32));
+}
+
+/**
+ * An example global include file.
+ *
+ * To use this file, rename to global.settings.php.
+ */
+
+$settings['file_temp_path'] = '/tmp';
+
+if (EnvironmentDetector::isAhEnv()) {
+  // Set the temp directory as per https://docs.acquia.com/acquia-cloud/manage/files/broken/
+  $settings['file_temp_path'] = '/mnt/gfs/' . EnvironmentDetector::getAhGroup() . '.' . EnvironmentDetector::getAhEnv() . '/tmp';
+}