From 46df63dea1295942fc9121868b2dc942160bc93b Mon Sep 17 00:00:00 2001 From: Alex Finnarn Date: Fri, 19 Jan 2024 15:54:06 -0500 Subject: [PATCH] be more specific with repo roots in settings for different envs --- docroot/sites/default/settings.php | 3 --- docroot/sites/default/settings/settings.local.php | 2 ++ docroot/sites/default/settings/settings.tugboat.php | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/sites/default/settings.php b/docroot/sites/default/settings.php index 5e7821995d..bb4f33269f 100755 --- a/docroot/sites/default/settings.php +++ b/docroot/sites/default/settings.php @@ -126,9 +126,6 @@ $settings['va_gov_web_root'] = '/var/www/cms/web'; $settings['va_gov_app_root'] = '/var/www/cms'; $settings['va_gov_vets_website_root'] = '/var/www/cms/docroot/vendor/va-gov/vets-website'; - -// @todo Add the next build root to the settings. -// For a workaround, I cloned the next-build repo into the docroot/vendor/va-gov/next-build directory. $settings['va_gov_next_build_root'] = '/var/www/html/docroot/vendor/va-gov/next-build'; // Defaults (should only be local that doesn't set these), default to dev for config_split diff --git a/docroot/sites/default/settings/settings.local.php b/docroot/sites/default/settings/settings.local.php index 29610f0852..8731ffe8bf 100644 --- a/docroot/sites/default/settings/settings.local.php +++ b/docroot/sites/default/settings/settings.local.php @@ -47,6 +47,8 @@ $settings['va_gov_app_root'] = getenv('DDEV_APPROOT'); $settings['va_gov_web_root'] = getenv('DDEV_APPROOT') . '/web'; $settings['va_gov_vets_website_root'] = getenv('DDEV_APPROOT') . '/docroot/vendor/va-gov/vets-website'; +// @todo Figure out why +//$settings['va_gov_next_build_root'] = getenv('DDEV_APPROOT') . '/next'; $settings['memcache']['servers'] = [ 'memcached:11211' => 'default', diff --git a/docroot/sites/default/settings/settings.tugboat.php b/docroot/sites/default/settings/settings.tugboat.php index 5bcd14b1e3..c6ab9b0c63 100644 --- a/docroot/sites/default/settings/settings.tugboat.php +++ b/docroot/sites/default/settings/settings.tugboat.php @@ -64,6 +64,7 @@ $settings['va_gov_app_root'] = getenv('TUGBOAT_ROOT'); $settings['va_gov_web_root'] = getenv('TUGBOAT_ROOT') . '/web'; $settings['va_gov_vets_website_root'] = getenv('TUGBOAT_ROOT') . '/docroot/vendor/va-gov/vets-website'; +$settings['va_gov_next_build_root'] = getenv('TUGBOAT_ROOT') . '/next'; $settings['memcache']['servers'] = [ 'memcache:11211' => 'default',