Applied nci_meo_code_changes_nov04.patch for MEO switch #5027

bryanpizzillo · 2025-11-05T17:59:13Z

No description provided.

bryanpizzillo · 2025-11-05T21:56:15Z

docroot/profiles/custom/cgov_site/modules/custom/cgov_core/src/CgovCoreTools.php


    // Check if site_env matches a prod environment name...
    if (in_array($site_env, self::PROD_AH_SITE_ENVS) ||
-      preg_match('/^.*(www-prod-acsf|www-cms).*$/', $site_env)) {


Hey @jfrank-nih -- I don't think this is something that should have been changed... But also, why is only this here?

bryanpizzillo · 2025-11-05T22:23:03Z

docroot/sites/default/settings.php

+if (isset($_ENV['AH_ENVIRONMENT_TYPE']) && $_ENV['AH_ENVIRONMENT_TYPE'] === 'meo') {
+  $settingsFiles = [
+    DRUPAL_ROOT . '/sites/settings/pre_includes.php',
+    DRUPAL_ROOT . '/sites/settings/post_includes.php',
+    DRUPAL_ROOT . '/sites/settings/post_memcache.php',
+    DRUPAL_ROOT . '/sites/settings/post_new_relic.php'
+  ];
+  foreach ($settingsFiles as $settingsFile) {
+    if (file_exists($settingsFile)) {
+      // phpcs:ignore
+      require $settingsFile;
+    }
+  }
  return;
 }


2 things:

The folder location means they are getting loaded in global.settings.php

These probably come first

We need to plot the order again of all the includes.

Return? Really? So are we skipping our config settings?

bryanpizzillo · 2025-11-05T22:23:20Z

docroot/sites/default/settings.php

-// ===== Added by acsf-init, please do not delete. Section end. =====
-}
+
+// @codingStandardsIgnoreFile


This is also a little silly.

bryanpizzillo · 2025-11-05T22:26:12Z

docroot/sites/settings/cgov_caching.settings.php

+  if ($_ENV['AH_ENVIRONMENT_TYPE'] === 'meo') {
+    switch ($env) {


This is messy. We should re-work this so it is just 1 switch. Maybe just fake the meo environment names...

But also, what in here is NOT going to get the max_age? Maybe we negate this whole thing. It looks like this is just for the everything but the local env.

(NOW, it USED to have different settings, but I think changes there make this no longer valid.)

bryanpizzillo · 2025-11-14T17:06:53Z

Based on discussions with Acquia we no longer need:

Settings

post_memcache.php - only needed by non cloud-next environments and was a port of the ACSF only settings.
post_new_relic.php - We should not be using it anymore.
pre_includes.php - DRS is called in the settings.php, so no need to call it again.

We also cleaned up the settings.php file to make it simpler

Hooks / Factory Hooks

000_meo_db_scrub - another port from acsf that was acsf specific.

bryanpizzillo · 2025-11-14T19:49:31Z

docroot/sites/default/settings/default.local.settings.php

-if (isset($_acsf_site_name)) {
-  $settings['file_public_path'] = "sites/default/files/$_acsf_site_name";
-  $settings['file_private_path'] = "$repo_root/files-private/$_acsf_site_name";
+if (isset($_meo_site_name)) {


I thoughtI removed all the meo junk and I, well, half did. We should fully do this...

cgdp-management-server · 2025-11-14T20:30:44Z

ODE Deployment

Code has been deployed to ODE 1046.

bryanpizzillo · 2025-11-18T22:39:53Z

docroot/sites/sites.php

+  // Include Acquia sites.inc
+  if (file_exists('/var/www/site-php')) {
+    // phpcs:ignore
+    require '/var/www/site-php/' . $_ENV['AH_SITE_GROUP'] . '/' . $_ENV['AH_SITE_GROUP'] . '-sites.inc';


@jfrank-nih - How do we want to manage this file? We talked about not just splatting the path-based domain $sites array before your variable you made for the default domain. Right now it has both mushed together.

- Only make $sites run for MEO - Removed $_meo_site_name settings for the DB as they are not needed. - Removed copy of 000-acquia_required_scrub conversion to MEO as it is not needed in this form. (Which calls ACSF) - Cleaned up "hooks" for site install and meo post-code-deploy. - Removed post_memcache.php, post_new_relic.php, and pre_includes.php. - Cleaned up settings.php to not load different settings if MEO or not. Settings had a block added by ACSF that failed fast and skipped a few of the settings. This was replicated in the MEO conversion, because it was in the ACSF config, but it was more of an acsf module opinion. - Setup an isMEO test in our settings helper, as well as prefixed meo environment names to match BLT names in order to avoid confusion with ACE names. - Cleaned up caching max_age block rewire to be MUCH simpler as we were listing every Acquia environment in a switch block and setting the max_age to the same value. This all was in a test for being in Acquia. So it was really pointless to have all the switches and tests. - Cleaned up how config_directories are set up - just added to settings instead of post-settings.php. - Don't print meo deployment and install scripts on processing. (e.g., no set -v) - www-prod-acsf tests were removed from CgovCoreTools in the patch and needed to be added back in.

…nly place we copy db). It would trigger on MEO though.

…luded: - Defaulting users file in blt.yml to use Acquia env vars, which also allowed us to remove meo-specific configs.

bryanpizzillo requested a review from a team as a code owner November 5, 2025 17:59

bryanpizzillo added the NO MERGE label Nov 5, 2025

bryanpizzillo commented Nov 5, 2025

View reviewed changes

bryanpizzillo force-pushed the meo-20251105 branch 2 times, most recently from 278f57f to aad3bb5 Compare November 12, 2025 18:55

bryanpizzillo force-pushed the meo-20251105 branch from aad3bb5 to 23b0c32 Compare November 14, 2025 17:22

bryanpizzillo commented Nov 14, 2025

View reviewed changes

bryanpizzillo force-pushed the meo-20251105 branch 2 times, most recently from 7ab1f78 to 5fce808 Compare November 18, 2025 22:35

bryanpizzillo commented Nov 18, 2025

View reviewed changes

bryanpizzillo added 3 commits November 21, 2025 09:56

Incorporated Acquia Changes for MEO into our htaccess patch

191b3e9

Remove ACSF Patch for htaccess changes.

37e0ab8

bryanpizzillo force-pushed the meo-20251105 branch from 5fce808 to 3225f57 Compare November 21, 2025 15:13

bryanpizzillo added 3 commits November 21, 2025 11:25

Removed blt-acsf & set MEO sites to disable acsf module

2e6deff

- Removed old db-scrub.sh script as it never triggered on ACSF (the o…

e2c8cad

…nly place we copy db). It would trigger on MEO though.

- Normalize CGDP config file paths deployed to environments. This inc…

a816ce3

…luded: - Defaulting users file in blt.yml to use Acquia env vars, which also allowed us to remove meo-specific configs.

bryanpizzillo force-pushed the meo-20251105 branch from 3225f57 to a816ce3 Compare November 21, 2025 16:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Applied nci_meo_code_changes_nov04.patch for MEO switch #5027

Applied nci_meo_code_changes_nov04.patch for MEO switch #5027

bryanpizzillo commented Nov 5, 2025

Uh oh!

bryanpizzillo Nov 5, 2025

Uh oh!

bryanpizzillo Nov 5, 2025

Uh oh!

bryanpizzillo Nov 5, 2025

Uh oh!

bryanpizzillo Nov 5, 2025

Uh oh!

bryanpizzillo commented Nov 14, 2025

Uh oh!

bryanpizzillo Nov 14, 2025

Uh oh!

cgdp-management-server bot commented Nov 14, 2025

Uh oh!

bryanpizzillo Nov 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		if ($_ENV['AH_ENVIRONMENT_TYPE'] === 'meo') {
		switch ($env) {

Applied nci_meo_code_changes_nov04.patch for MEO switch #5027

Are you sure you want to change the base?

Applied nci_meo_code_changes_nov04.patch for MEO switch #5027

Conversation

bryanpizzillo commented Nov 5, 2025

Uh oh!

bryanpizzillo Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

bryanpizzillo Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

bryanpizzillo Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

bryanpizzillo Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

bryanpizzillo commented Nov 14, 2025

Settings

Hooks / Factory Hooks

Uh oh!

bryanpizzillo Nov 14, 2025

Choose a reason for hiding this comment

Uh oh!

cgdp-management-server bot commented Nov 14, 2025

ODE Deployment

Uh oh!

bryanpizzillo Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants