From 1b084f68d5bb07cf46f02d7128551136b9bad9a7 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Wed, 5 Apr 2017 11:54:22 -0500
Subject: [PATCH 1/2] Allow building settings.php to different destinations.

---
 docs/properties.md | 1 +
 tasks/drupal.xml   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/properties.md b/docs/properties.md
index 01d04b16..97c2e775 100644
--- a/docs/properties.md
+++ b/docs/properties.md
@@ -35,6 +35,7 @@ Cool! This phing-ism is what powers our environment-specific property layering a
 | `build.artifact_mode` | `symlink` | Whether to `symlink` or `copy` assets like CSS, JS, and other code during the build. |
 | `build.test_output` | `/dev/null` | Where to output reports from tests. On Circle, try `${env.CIRCLE_TEST_REPORTS}`. |
 | `build.drupal.settings` | `conf/drupal/settings.php` | Source template for Drupal's `settings.php` file. |
+| `build.drupal.settings_dest` | `web/sites/default/settings.php` | Destination for the templated settings.php file. |
 | `build.drupal.services` | `conf/drupal/services.yml` | Source template for Drupal's `services.yml` file. |
 
 
diff --git a/tasks/drupal.xml b/tasks/drupal.xml
index 4d649b22..2fd07c28 100644
--- a/tasks/drupal.xml
+++ b/tasks/drupal.xml
@@ -41,6 +41,7 @@
     <property name="drupal.twig.debug" value="false" />
     <property name="drupal.config_sync_directory" value="../conf/drupal/config" /> <!-- pantheon = private/config -->
     <property name="build.drupal.settings" value="conf/drupal/settings.php" />
+    <property name="build.drupal.settings_dest" value="${drupal.root}/sites/${drupal.sites_subdir}/settings.php" />
     <property name="build.drupal.services" value="conf/drupal/services.yml" />
 
     <!-- These properties will generally not change. -->
@@ -143,11 +144,10 @@
 
     <!-- Target: drupal-prepare-settings -->
     <target name="drupal-prepare-settings">
-        <fail unless="drupal.root" />
-        <fail unless="drupal.sites_subdir" />
         <fail unless="build.drupal.settings" />
+        <fail unless="build.drupal.settings_dest" />
 
-        <copy file="${build.dir}/${build.drupal.settings}" tofile="${build.dir}/${drupal.root}/sites/${drupal.sites_subdir}/settings.php" overwrite="true" mode="555">
+        <copy file="${build.dir}/${build.drupal.settings}" tofile="${build.dir}/${build.drupal.settings_dest}" overwrite="true" mode="555">
             <filterchain>
                 <expandproperties />
             </filterchain>

From 7a14c460f66b7ed4b2e21098915ca1ec89cd4b31 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Thu, 6 Apr 2017 13:46:09 -0500
Subject: [PATCH 2/2] Also allow specifying the services.yml destination.

---
 docs/properties.md | 1 +
 tasks/drupal.xml   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/properties.md b/docs/properties.md
index 97c2e775..e37fc209 100644
--- a/docs/properties.md
+++ b/docs/properties.md
@@ -37,6 +37,7 @@ Cool! This phing-ism is what powers our environment-specific property layering a
 | `build.drupal.settings` | `conf/drupal/settings.php` | Source template for Drupal's `settings.php` file. |
 | `build.drupal.settings_dest` | `web/sites/default/settings.php` | Destination for the templated settings.php file. |
 | `build.drupal.services` | `conf/drupal/services.yml` | Source template for Drupal's `services.yml` file. |
+| `build.drupal.services_dest` | `web/sites/default/services.yml` | Destination for the templated `services.yml` file. |
 
 
 ### Drupal
diff --git a/tasks/drupal.xml b/tasks/drupal.xml
index 2fd07c28..74ccc80e 100644
--- a/tasks/drupal.xml
+++ b/tasks/drupal.xml
@@ -43,6 +43,7 @@
     <property name="build.drupal.settings" value="conf/drupal/settings.php" />
     <property name="build.drupal.settings_dest" value="${drupal.root}/sites/${drupal.sites_subdir}/settings.php" />
     <property name="build.drupal.services" value="conf/drupal/services.yml" />
+    <property name="build.drupal.services_dest" value="${drupal.root}/sites/${drupal.sites_subdir}/services.yml" />
 
     <!-- These properties will generally not change. -->
     <property name="drupal.sites_subdir" value="default" /> <!-- Directory within 'sites' dir in the drupal root -->
@@ -157,11 +158,10 @@
 
     <!-- Target: drupal-prepare-services -->
     <target name="drupal-prepare-services">
-        <fail unless="drupal.root" />
-        <fail unless="drupal.sites_subdir" />
         <fail unless="build.drupal.services" />
+        <fail unless="build.drupal.services_dest" />
 
-        <copy file="${build.dir}/${build.drupal.services}" tofile="${build.dir}/${drupal.root}/sites/${drupal.sites_subdir}/services.yml" overwrite="true" mode="644">
+        <copy file="${build.dir}/${build.drupal.services}" tofile="${build.dir}/${build.drupal.services_dest}" overwrite="true" mode="644">
             <filterchain>
                 <expandproperties />
             </filterchain>