From 61dcf105de367a5e0598cf8d8b10cb4e08329f3a Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Tue, 4 Apr 2017 17:06:53 -0400 Subject: [PATCH] Standardizing config split stage name. --- settings/blt.settings.php | 2 +- settings/config.settings.php | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/settings/blt.settings.php b/settings/blt.settings.php index 2efb3fcd5..e95e7f0e5 100644 --- a/settings/blt.settings.php +++ b/settings/blt.settings.php @@ -38,7 +38,7 @@ $ah_group = isset($_ENV['AH_SITE_GROUP']) ? $_ENV['AH_SITE_GROUP'] : NULL; $is_ah_env = (bool) $ah_env; $is_ah_prod_env = ($ah_env == 'prod' || $ah_env == '01live'); -$is_ah_stage_env = ($ah_env == 'test' || $ah_env == '01test' || $ah_env == 'stage'); +$is_ah_stage_env = ($ah_env == 'test' || $ah_env == '01test' || $ah_env == 'stg'); $is_ah_dev_cloud = (!empty($_SERVER['HTTP_HOST']) && strstr($_SERVER['HTTP_HOST'], 'devcloud')); $is_ah_dev_env = (preg_match('/^dev[0-9]*$/', $ah_env) || $ah_env == '01dev'); $is_acsf = (!empty($ah_group) && file_exists("/mnt/files/$ah_group.$ah_env/files-private/sites.json")); diff --git a/settings/config.settings.php b/settings/config.settings.php index b9b1a3d3d..5a24c9c21 100644 --- a/settings/config.settings.php +++ b/settings/config.settings.php @@ -37,16 +37,10 @@ } } elseif ($is_ah_stage_env) { - $split = 'test'; + $split = 'stage'; if (file_exists("$split_filepath_prefix.$split.yml")) { $config["$split_filename_prefix.$split"]['status'] = TRUE; } - else { - $split = 'stg'; - if (file_exists("$split_filepath_prefix.$split.yml")) { - $config["$split_filename_prefix.$split"]['status'] = TRUE; - } - } } elseif ($is_ah_prod_env) { $split = 'prod';