Merge pull request #31 from acquia/ACMS-3508

ACMS-3508: Update config.settings.php with drs override config dir.

Author: vishalkhode1

settings/acquia-recommended.settings.php

@@ -135,7 +135,7 @@
 
 foreach ($settings_files as $settings_file) {
   if (file_exists($settings_file)) {
-        // phpcs:ignore
-        require $settings_file;
+    // phpcs:ignore
+    require $settings_file;
   }
 }

settings/config.settings.php

@@ -15,26 +15,41 @@
  * directory should be shared between all multi-sites, and each multisite will
  * override this selectively using configuration splits. However, some
  * applications may prefer to manage the configuration for each multisite
- * completely separately. If this is the case, they can set
- * $drs_override_config_directories to FALSE and
- * $settings['config_sync_directory'] = $dir . "/config/$site_dir" in
+ * completely separately. If this is the case,
+ * set FALSE to $drs_override_config_directories
+ * and $drs_override_site_studio_sync_directories
+ * $settings['config_sync_directory'] = $dir . "/config/$site_dir"
+ * $settings['site_studio_sync'] =  $dir . "/sitestudio/$site_dir" in
  * settings.php, and we will not overwrite it.
  */
-
+// phpcs:ignore
+$drs_override_config_directories = $drs_override_config_directories ?? FALSE;
+$drs_override_site_studio_sync_directories = $drs_override_site_studio_sync_directories ?? FALSE;
 
 /**
  * Site path.
  *
  * @var string $site_path
  * This is always set and exposed by the Drupal Kernel.
  */
- // phpcs:ignore
- $site_name = EnvironmentDetector::getSiteName($site_path);
+// phpcs:ignore
+$site_name = EnvironmentDetector::getSiteName($site_path);
+
 // phpcs:ignore
 // Config sync settings.
-$settings['config_sync_directory'] = "../config/" . $site_name;
+// if $settings['config_sync_directory'] isn't set by user the DRS
+// set to the ../config/$site_name and if $drs_override_config_directories
+// is TRUE then it sets to ../config/default.
+$config_settings = $settings['config_sync_directory'] ?? "../config/$site_name";
+$settings['config_sync_directory'] = !$drs_override_config_directories ? $config_settings : "../config/default";
+
 // Site Studio sync settings.
-$settings['site_studio_sync'] = "../sitestudio/" . $site_name;
+// if $settings['site_studio_sync'] isn't set by user the DRS
+// set to the ../sitestudio/$site_name and if
+// $drs_override_site_studio_sync_directories is TRUE
+// then it sets to ../sitestudio/default.
+$site_studio_config_settings = $settings['site_studio_sync'] ?? "../sitestudio/$site_name";
+$settings['site_studio_sync'] = !$drs_override_site_studio_sync_directories ? $site_studio_config_settings : "../sitestudio/default";
 
 $split_filename_prefix = 'config_split.config_split';