From f0fca9b93e62bbb8fae74439d5dc329637637c47 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matt.grasmick@gmail.com>
Date: Mon, 3 Apr 2017 16:26:11 -0400
Subject: [PATCH] Connects to #678: Set config sync dir correctly, despite ACE
 defaults.

---
 phing/tasks/setup.xml               | 16 +---------------
 settings/config.settings.php        |  6 ++++++
 settings/default.local.settings.php |  4 ----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/phing/tasks/setup.xml b/phing/tasks/setup.xml
index 8b5218c1b..9536c70e3 100644
--- a/phing/tasks/setup.xml
+++ b/phing/tasks/setup.xml
@@ -250,21 +250,7 @@
           <param>config_split</param>
         </drush>
 
-        <!-- Only import config if it exists. -->
-        <if>
-          <and>
-            <isset property="env.AH_SITE_ENVIRONMENT"/>
-          </and>
-          <then>
-            <drush command="config-import" assume="yes" alias="${drush.alias}">
-              <!-- Cloud environments require vcs parameter. -->
-              <param>vcs</param>
-            </drush>
-          </then>
-          <else>
-            <drush command="config-import" assume="yes" alias="${drush.alias}"></drush>
-          </else>
-        </if>
+        <drush command="config-import" assume="yes" alias="${drush.alias}"></drush>
 
       </then>
     </if>
diff --git a/settings/config.settings.php b/settings/config.settings.php
index a372aaa35..1a89b04a6 100644
--- a/settings/config.settings.php
+++ b/settings/config.settings.php
@@ -1,5 +1,9 @@
 <?php
 
+// Configuration directories.
+$dir = dirname(DRUPAL_ROOT);
+$config_directories['sync'] = $dir . "/config/$site_dir";
+
 // Ensure the appropriate config split is enabled.
 $config['config_split.config_split.local']['status'] = FALSE;
 $config['config_split.config_split.dev']['status'] = FALSE;
@@ -16,6 +20,8 @@
   }
 }
 else {
+  $config_directories['vcs'] = $config_directories['sync'];
+
   if ($is_ah_dev_env) {
     $config['config_split.config_split.dev']['status'] = TRUE;
   }
diff --git a/settings/default.local.settings.php b/settings/default.local.settings.php
index 33ce16d19..3d713ced5 100644
--- a/settings/default.local.settings.php
+++ b/settings/default.local.settings.php
@@ -25,10 +25,6 @@
   ),
 );
 
-// Configuration directories.
-$dir = dirname(DRUPAL_ROOT);
-$config_directories['sync'] = $dir . "/config/$site_dir";
-
 // Use development service parameters.
 $settings['container_yamls'][] = $dir . '/docroot/sites/development.services.yml';