diff --git a/.gitignore b/.gitignore index 4213bcfdedf3c516c1a1b7ac941b52607904af53..3bba55306ddeda4073d129798bcdbe496fec060a 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,6 @@ Thumbs.db # Things in the core directory that Drupal 8 commits in the repository. !web/core/**/*.gz + +# Lando config file +.lando.yml diff --git a/scripts/child_site_list.txt b/scripts/child_site_list.txt index 88e596bb4373c045e4a1b010591837480b83d6c1..2ee854300d3865229838389a6ed59cacb03bc03c 100644 --- a/scripts/child_site_list.txt +++ b/scripts/child_site_list.txt @@ -6,3 +6,4 @@ global-arts-and-humanities mathematical-biosciences-institute migration-target ppec +roy-modern-head diff --git a/web/sites/default/settings.local.php b/web/sites/default/settings.local.php index 81a15516192898f2c22d18d61101f26702cc339d..6e8ab9327d5d8d8efd906d4e6f3f50f9e6fb931a 100644 --- a/web/sites/default/settings.local.php +++ b/web/sites/default/settings.local.php @@ -97,7 +97,7 @@ //error_log('set home dir: ' . $_ENV['HOME']); } else { - die("pantheon environment is lando but LANDO_WEBROOT isn't set"); + error_log("pantheon environment is lando but LANDO_WEBROOT isn't set"); } $settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml'; @@ -105,7 +105,7 @@ $config['system.performance']['js']['preprocess'] = FALSE; $settings['cache']['bins']['render'] = 'cache.backend.null'; $settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null'; - $settings['extension_discovery_scan_tests'] = TRUE; + $settings['extension_discovery_scan_tests'] = FALSE; } else if ( $_SERVER['HTTP_HOST'] == 'ascbsc.osu.edu' || $_SERVER['HTTP_HOST'] == 'intranet.asc.ohio-state.edu' ||