From c6f0c9860ecc85f17cfcc994e3e279eb382ec705 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Fri, 3 Sep 2021 18:28:51 -0500
Subject: [PATCH] Don't do settings.php templating in the-build.

---
 defaults.yml                                  |   4 +-
 defaults/install/build.xml                    |  15 ---
 defaults/install/drupal/services.build.yml    |   6 -
 .../install/drupal/settings.build-acquia.php  |  43 -------
 .../drupal/settings.build-pantheon.php        |  18 ---
 .../drupal/settings.build-platformsh.php      |  21 ----
 defaults/install/drupal/settings.build.php    |  49 --------
 defaults/install/the-build/build.acquia.yml   |  10 --
 defaults/install/the-build/build.pantheon.yml |  10 --
 .../install/the-build/build.platformsh.yml    |  10 --
 targets/install.xml                           | 110 ++++++------------
 11 files changed, 38 insertions(+), 258 deletions(-)
 delete mode 100644 defaults/install/drupal/services.build.yml
 delete mode 100644 defaults/install/drupal/settings.build-acquia.php
 delete mode 100644 defaults/install/drupal/settings.build-pantheon.php
 delete mode 100644 defaults/install/drupal/settings.build-platformsh.php
 delete mode 100644 defaults/install/drupal/settings.build.php
 delete mode 100644 defaults/install/the-build/build.acquia.yml
 delete mode 100644 defaults/install/the-build/build.pantheon.yml
 delete mode 100644 defaults/install/the-build/build.platformsh.yml

diff --git a/defaults.yml b/defaults.yml
index e0779d39..6419ae62 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -14,7 +14,7 @@
 build:
   # The destination host, either 'acquia', 'pantheon', 'platformsh', or 'other'. This is
   # currently only used when setting up the settings.php file for a Drupal site.
-  host: other
+  host: acquia
 
 # Drupal configuration used by targets/drupal.xml
 drupal:
@@ -240,7 +240,7 @@ phpcs:
   # use the extensions option (below). This option should not be used with Coder >= 8.3.7, which only
   # checks php, inc, css, and js by default.
   ignore: "*.md"
-  
+
   # Comma-separated list of extensions to check in the PHP_CodeSniffer review.
   extensions: "php,module,inc,install,test,profile,theme,css,info,txt,yml,js"
 
diff --git a/defaults/install/build.xml b/defaults/install/build.xml
index 0bf4ce68..d3314fe1 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -43,21 +43,6 @@
         <mkdir dir="${drupal.root}/${drupal.site.settings.file_private_path}" />
         <chmod file="${drupal.root}/${drupal.site.settings.file_private_path}" mode="640" />
 
-        <!-- Copy the settings.build.php and services.build.php templates into place. -->
-        <copy todir="${build.dir}" overwrite="true" mode="544">
-            <!-- Copy the template files -->
-            <filelist dir="${build.dir}" files="${drupal.site.build.settings_template},${drupal.site.build.services_template}" />
-            <!-- Map templates to their destinations -->
-            <mapper type="firstmatch">
-                <mapper type="glob" from="${drupal.site.build.settings_template}" to="${drupal.site.build.settings_dest}" />
-                <mapper type="glob" from="${drupal.site.build.services_template}" to="${drupal.site.build.services_dest}" />
-            </mapper>
-            <!-- Substitute property values -->
-            <filterchain>
-                <expandproperties />
-            </filterchain>
-        </copy>
-
         <!-- Include styleguide resources in the theme. This approach will symlink
              resources in development environments, and copy them for artifact builds. -->
         <!-- <includeresource source="styleguide/source/assets/css" dest="${drupal.root}/themes/custom/example_theme/css" /> -->
diff --git a/defaults/install/drupal/services.build.yml b/defaults/install/drupal/services.build.yml
deleted file mode 100644
index d5954144..00000000
--- a/defaults/install/drupal/services.build.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# See sites/default/default.services.yml for details.
-parameters:
-  twig.config:
-    debug: ${drupal.twig.debug}
-    auto_reload: null
-    cache: true
diff --git a/defaults/install/drupal/settings.build-acquia.php b/defaults/install/drupal/settings.build-acquia.php
deleted file mode 100644
index 311b60a1..00000000
--- a/defaults/install/drupal/settings.build-acquia.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal settings file template for use on Acquia environments.
- */
-
-$settings['trusted_host_patterns'][] = "^{$_ENV['AH_SITE_ENVIRONMENT']}dev.prod.acquia-sites.com";
-$settings['trusted_host_patterns'][] = "^{$_ENV['AH_SITE_ENVIRONMENT']}stg.prod.acquia-sites.com";
-
-$settings['file_public_path'] = '${drupal.site.settings.file_public_path}';
-$settings['file_private_path'] = "/mnt/gfs/{$_ENV['AH_SITE_GROUP']}.{$_ENV['AH_SITE_ENVIRONMENT']}/files-private";
-$settings['file_temp_path'] = $_ENV['TEMP'];
-
-$settings['config_sync_directory'] = '${drupal.site.config_sync_directory}';
-
-// Enable/disable config_split configurations.
-if (isset($_ENV['AH_PRODUCTION']) && $_ENV['AH_PRODUCTION']) {
-  $config['config_split.config_split.production']['status'] = TRUE;
-}
-elseif (isset($_ENV['AH_NON_PRODUCTION']) && $_ENV['AH_NON_PRODUCTION']) {
-  $config['config_split.config_split.staging']['status'] = TRUE;
-}
-
-//// Add an htaccess prompt on dev and staging environments.
-//// @see https://docs.acquia.com/acquia-cloud/arch/security/nonprod/#cloud-set-basicauth
-
-// Make sure Drush keeps working.
-// Modified from function drush_verify_cli()
-$cli = (php_sapi_name() == 'cli');
-
-// PASSWORD-PROTECT NON-PRODUCTION SITES (i.e. staging/dev)
-if (!$cli && (isset($_ENV['AH_NON_PRODUCTION']) && $_ENV['AH_NON_PRODUCTION'])) {
-  $username = 'palantir';
-  $password = 'some mediocre password';
-  if (!(isset($_SERVER['PHP_AUTH_USER']) && ($_SERVER['PHP_AUTH_USER']==$username && $_SERVER['PHP_AUTH_PW']==$password))) {
-    header('WWW-Authenticate: Basic realm="This site is protected"');
-    header('HTTP/1.0 401 Unauthorized');
-    // Fallback message when the user presses cancel / escape
-    echo 'Access denied';
-    exit;
-  }
-}
diff --git a/defaults/install/drupal/settings.build-pantheon.php b/defaults/install/drupal/settings.build-pantheon.php
deleted file mode 100644
index 0639ce7a..00000000
--- a/defaults/install/drupal/settings.build-pantheon.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal settings file template for use on Pantheon environments.
- */
-
-$settings['config_sync_directory'] = '${drupal.site.config_sync_directory}';
-
-// Enable/disable config_split configurations.
-if (isset($_ENV['PANTHEON_ENVIRONMENT'])) {
-  if ($_ENV['PANTHEON_ENVIRONMENT'] == 'live') {
-    $config['config_split.config_split.production']['status'] = TRUE;
-  }
-  else {
-    $config['config_split.config_split.staging']['status'] = TRUE;
-  }
-}
diff --git a/defaults/install/drupal/settings.build-platformsh.php b/defaults/install/drupal/settings.build-platformsh.php
deleted file mode 100644
index ba04580e..00000000
--- a/defaults/install/drupal/settings.build-platformsh.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal settings file template for use on Platform.sh environments.
- */
-
-$settings['config_sync_directory'] = '${drupal.site.config_sync_directory}';
-
-// Use the temporary directory set up in .platform.app.yaml
-$settings['file_temp_path'] = '/tmp';
-
-// Enable/disable config_split configurations.
-if (isset($_ENV['PLATFORM_BRANCH'])) {
-  if ($_ENV['PLATFORM_BRANCH'] == 'master') {
-    $config['config_split.config_split.production']['status'] = TRUE;
-  }
-  else {
-    $config['config_split.config_split.staging']['status'] = TRUE;
-  }
-}
diff --git a/defaults/install/drupal/settings.build.php b/defaults/install/drupal/settings.build.php
deleted file mode 100644
index 5287f758..00000000
--- a/defaults/install/drupal/settings.build.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @file Drupal settings file template for use on development environments.
- */
-
-$databases['default']['default'] = array(
-  'driver' => 'mysql',
-  'database' => '${drupal.site.database.database}',
-  'username' => '${drupal.site.database.username}',
-  'password' => '${drupal.site.database.password}',
-  'host' => '${drupal.site.database.host}',
-  'prefix' => '',
-  'collation' => 'utf8mb4_general_ci',
-);
-
-$settings['config_sync_directory'] = '${drupal.site.config_sync_directory}';
-
-$settings['hash_salt'] = '${drupal.site.hash_salt}';
-$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/development.services.yml';
-$settings['container_yamls'][] = __DIR__ . '/services.build.yml';
-
-$settings['file_public_path'] = '${drupal.site.settings.file_public_path}';
-$settings['file_private_path'] = '${drupal.site.settings.file_private_path}';
-
-// Use the standard temporary directory on the development environment (update if the
-// project's development environment is configured differently).
-$settings['file_temp_path'] = '/tmp';
-
-// Enable/disable config_split configurations. To simulate other config split
-// environments, change "development" to either "staging" or "production", then run:
-//   drush cr && drush cim -y
-$config['config_split.config_split.development']['status'] = TRUE;
-
-// Disable the render cache.
-$settings['cache']['bins']['render'] = 'cache.backend.null';
-
-// Disable the dynamic page cache.
-$settings['cache']['bins']['dynamic_page_cache'] = 'cache.backend.null';
-
-// Disable CSS and JS aggregation.
-$config['system.performance']['css']['preprocess'] = FALSE;
-$config['system.performance']['js']['preprocess'] = FALSE;
-
-// Don't chmod the sites subdirectory.
-$settings['skip_permissions_hardening'] = TRUE;
-
-// Turn errors up.
-$config['system.logging']['error_level'] = 'verbose';
diff --git a/defaults/install/the-build/build.acquia.yml b/defaults/install/the-build/build.acquia.yml
deleted file mode 100644
index 4fcfa84d..00000000
--- a/defaults/install/the-build/build.acquia.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# @file
-# Configuration properties specific to the Acquia deployment.
-drupal:
-  twig:
-    debug: false
-  sites:
-    default:
-      build:
-        settings_template: .the-build/drupal/settings.build-acquia.php
-        services_dest: artifacts/dev/null
diff --git a/defaults/install/the-build/build.pantheon.yml b/defaults/install/the-build/build.pantheon.yml
deleted file mode 100644
index 1729d3f6..00000000
--- a/defaults/install/the-build/build.pantheon.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# @file
-# Configuration properties specific to the Pantheon deployment.
-drupal:
-  twig:
-    debug: false
-  sites:
-    default:
-      build:
-        settings_template: .the-build/drupal/settings.build-pantheon.php
-        services_dest: artifacts/dev/null
diff --git a/defaults/install/the-build/build.platformsh.yml b/defaults/install/the-build/build.platformsh.yml
deleted file mode 100644
index b7f10aef..00000000
--- a/defaults/install/the-build/build.platformsh.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# @file
-# Configuration properties specific to the Platform.sh deployment.
-drupal:
-  twig:
-    debug: false
-  sites:
-    default:
-      build:
-        settings_template: .the-build/drupal/settings.build-platformsh.php
-        services_dest: artifacts/dev/null
diff --git a/targets/install.xml b/targets/install.xml
index ab2a67ea..39e909c1 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -48,6 +48,12 @@
             <case value="acquia">
                 <property name="drupal.root" value="docroot" />
             </case>
+            <case value="pantheon">
+              <property name="drupal.root" value="web" />
+            </case>
+            <case value="platformsh">
+              <property name="drupal.root" value="web" />
+            </case>
             <default />
         </switch>
 
@@ -137,34 +143,8 @@
         <!-- Copy the CircleCI properties. -->
         <copy file="${phing.dir.install}/../defaults/install/the-build/build.circleci.yml" tofile="${application.startdir}/.the-build/build.circleci.yml" overwrite="true" />
 
-        <!-- Add host-specific files for settings.php templates, the-build properties, and hosting configuration. -->
-        <switch value="${build.host}">
-            <case value="acquia">
-                <copy file="${phing.dir.install}/../defaults/install/drupal/settings.build-acquia.php" todir="${application.startdir}/.the-build/drupal" overwrite="true" />
-                <copy file="${phing.dir.install}/../defaults/install/the-build/build.acquia.yml" todir="${application.startdir}/.the-build" overwrite="true" />
-            </case>
-
-            <case value="pantheon">
-                <copy file="${build.thebuild.dir}/defaults/install/drupal/settings.build-pantheon.php" todir="${application.startdir}/.the-build/drupal" overwrite="true" />
-                <copy file="${build.thebuild.dir}/defaults/install/the-build/build.pantheon.yml" todir="${application.startdir}/.the-build" overwrite="true" />
-                <copy file="${build.thebuild.dir}/defaults/install/pantheon.yml" todir="${application.startdir}" overwrite="true" />
-            </case>
-
-            <case value="platformsh">
-                <copy file="${build.thebuild.dir}/defaults/install/drupal/settings.build-platformsh.php" todir="${application.startdir}/.the-build/drupal" overwrite="true" />
-                <copy file="${build.thebuild.dir}/defaults/install/the-build/build.platformsh.yml" todir="${application.startdir}/.the-build" overwrite="true" />
-                <copy file="${build.thebuild.dir}/defaults/install/.platform.app.yaml" todir="${application.startdir}" overwrite="true" />
-                <copy todir="${application.startdir}/.platform" overwrite="true">
-                    <fileset dir="${build.thebuild.dir}/defaults/install/.platform" />
-                </copy>
-                <httpget url="https://raw.githubusercontent.com/platformsh/template-drupal8/master/.environment" dir="${build.dir}/" />
-            </case>
-            <default />
-        </switch>
-
-        <!-- Copy Drupal configuration templates (used by the 'build' target). -->
-        <copy file="${phing.dir.install}/../defaults/install/drupal/services.build.yml" todir="${application.startdir}/.the-build/drupal" />
-        <copy file="${phing.dir.install}/../defaults/install/drupal/settings.build.php" todir="${application.startdir}/.the-build/drupal" />
+        <!-- Add host-specific configuration files. -->
+        <phingcall target="configure-host" />
 
         <!-- Copy Drush configuration and aliases file templates. -->
         <copy file="${phing.dir.install}/../defaults/install/drush/drush.yml" tofile="${application.startdir}/drush/drush.yml" overwrite="true">
@@ -181,9 +161,9 @@
         </copy>
 
         <!-- Set up the Drupal sites directory. -->
-        <phingcall target="drupal-sites-directory">
-            <property name="drupal.site.dir" value="default" />
-        </phingcall>
+        <mkdir dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
+        <chmod mode="750" file="${build.dir}/${drupal.root}/sites/default/" />
+        <mkdir dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}/files" />
 
         <!-- Run the first build. -->
         <phing dir="${application.startdir}" target="build" inheritAll="false" />
@@ -224,55 +204,37 @@
               $> phing test</echo>
     </target>
 
+  <target name="configure-host" description="Add host-specific configuration files.">
+    <fail unless="build.host" />
 
-    <target name="drupal-sites-directory" hidden="true">
-        <fail unless="drupal.site.dir" />
-        <fail unless="build.host" />
-        <fail unless="drupal.root" />
-        <fail unless="build.dir" />
+    <switch value="${build.host}">
+      <case value="pantheon">
+        <!-- Project-level setup -->
+        <copy file="${build.thebuild.dir}/defaults/install/pantheon.yml" todir="${application.startdir}" overwrite="true" />
 
-        <!-- Make sure the sites directory exists. This is not necessary for the 'default' site, but is required for creating additional multisites. -->
-        <mkdir dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
+        <!-- Site-level setup -->
+        <httpget url="https://raw.githubusercontent.com/pantheon-systems/drops-8/default/sites/default/settings.pantheon.php" dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
+      </case>
 
-        <!-- Use our own basic Drupal settings.php file. -->
-        <chmod mode="750" file="${build.dir}/${drupal.root}/sites/default/" />
-        <copy file="${build.thebuild.dir}/defaults/install_site/drupal/settings.php" tofile="${build.dir}/${drupal.root}/sites/${drupal.site.dir}/settings.php" overwrite="true">
-            <filterchain>
-                <expandproperties />
-            </filterchain>
-        </copy>
-
-        <!-- Use the default Drupal services.yml file. -->
-        <copy file="${build.dir}/${drupal.root}/sites/default/default.services.yml" tofile="${build.dir}/${drupal.root}/sites/${drupal.site.dir}/services.yml" overwrite="true">
-            <filterchain>
-                <striplinecomments>
-                    <comment value="#" />
-                </striplinecomments>
-            </filterchain>
+      <case value="platformsh">
+        <!-- Project-level setup -->
+        <copy file="${build.thebuild.dir}/defaults/install/.platform.app.yaml" todir="${application.startdir}" overwrite="true" />
+        <copy todir="${application.startdir}/.platform" overwrite="true">
+          <fileset dir="${build.thebuild.dir}/defaults/install/.platform" />
         </copy>
+        <httpget url="https://raw.githubusercontent.com/platformsh/template-drupal8/master/.environment" dir="${build.dir}/" />
 
-        <!-- Add host-specific settings.php and deployment files. -->
-        <switch value="${build.host}">
-            <case value="acquia">
-                <copy file="${build.thebuild.dir}/defaults/install_site/drupal/settings.acquia.php" todir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
-            </case>
+        <!-- Site-level setup -->
+        <composer command="require" composer="${composer.composer}">
+          <arg line="--working-dir ${application.startdir}" />
+          <arg value="platformsh/config-reader:^2.1" />
+        </composer>
+        <httpget url="https://raw.githubusercontent.com/platformsh/template-drupal8/master/web/sites/default/settings.platformsh.php" dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
+      </case>
 
-            <case value="pantheon">
-                <httpget url="https://raw.githubusercontent.com/pantheon-systems/drops-8/default/sites/default/settings.pantheon.php" dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
-            </case>
-
-            <case value="platformsh">
-                <composer command="require" composer="${composer.composer}">
-                    <arg line="--working-dir ${application.startdir}" />
-                    <arg value="platformsh/config-reader:^2.1" />
-                </composer>
-                <httpget url="https://raw.githubusercontent.com/platformsh/template-drupal8/master/web/sites/default/settings.platformsh.php" dir="${build.dir}/${drupal.root}/sites/${drupal.site.dir}" />
-            </case>
-            <default />
-        </switch>
-
-        <echo msg="Set up the Drupal sites directory at '${drupal.root}/sites/${drupal.site.dir}/'" />
-    </target>
+      <default />
+    </switch>
 
+  </target>
 
 </project>