From eeab814df7a825ac6dc0a43fe66991da9e74411d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Fri, 20 Mar 2020 18:43:12 -0400 Subject: [PATCH] Use new style of config sync directory specification Per https://www.drupal.org/node/3018145 Thanks wolcen! Ref #109 --- web/sites/default/settings.ddev.php | 5 ----- web/sites/default/settings.php | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/web/sites/default/settings.ddev.php b/web/sites/default/settings.ddev.php index 29c495b..84ed5dd 100644 --- a/web/sites/default/settings.ddev.php +++ b/web/sites/default/settings.ddev.php @@ -57,11 +57,6 @@ $config['image.settings']['suppress_itok_output'] = TRUE; $config['image.settings']['allow_insecure_derivatives'] = TRUE; -// This specifies the default configuration sync directory. -if (empty($config_directories[CONFIG_SYNC_DIRECTORY])) { - $config_directories[CONFIG_SYNC_DIRECTORY] = '../config/sync'; -} - /** * Load services definition file. */ diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index f402f4b..cc6670c 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -4,6 +4,8 @@ $settings['locale_custom_strings_en'][] = [ 'Sticky at top of lists' => 'Feature on front page', ]; +$settings['config_sync_directory'] = '../config/sync'; + // #ddev-generated: Automatically generated Drupal settings file. if (file_exists($app_root . '/' . $site_path . '/settings.ddev.php')) {