Skip to content

Commit

Permalink
ACMS-3508: Update config settings file as per review feedback.
Browse files Browse the repository at this point in the history
  • Loading branch information
apathak18 committed Jan 23, 2024
1 parent 68d768c commit 5a79e3c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
4 changes: 2 additions & 2 deletions settings/acquia-recommended.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
25 changes: 13 additions & 12 deletions settings/config.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@
* 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
if (!isset($drs_override_config_directories)) {
$drs_override_config_directories = TRUE;
}
$drs_override_config_directories = !isset($drs_override_config_directories) ? TRUE : FALSE;
$drs_override_site_studio_sync_directories = !isset($drs_override_site_studio_sync_directories) ? TRUE : FALSE;

/**
* Site path.
Expand All @@ -35,12 +36,12 @@
$site_name = EnvironmentDetector::getSiteName($site_path);

// phpcs:ignore
if ($drs_override_config_directories) {
// Config sync settings.
$settings['config_sync_directory'] = "../config/" . $site_name;
// Site Studio sync settings.
$settings['site_studio_sync'] = "../sitestudio/" . $site_name;
}
// Config sync settings.
$settings['config_sync_directory'] = $drs_override_config_directories ?
"../config/$site_name" : "../config/default";
// Site Studio sync settings.
$settings['site_studio_sync'] = $drs_override_site_studio_sync_directories ?
"../sitestudio/$site_name" : "../sitestudio/default";

$split_filename_prefix = 'config_split.config_split';

Expand Down

0 comments on commit 5a79e3c

Please sign in to comment.