From ecc8603a005a67770092ae1834971cc803fa1844 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Fri, 27 Jan 2023 19:55:31 -0500
Subject: [PATCH 1/9] delete unused settings.php

---
 defaults/install_site/drupal/settings.php | 51 -----------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 defaults/install_site/drupal/settings.php

diff --git a/defaults/install_site/drupal/settings.php b/defaults/install_site/drupal/settings.php
deleted file mode 100644
index cb81013c..00000000
--- a/defaults/install_site/drupal/settings.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal's main configuration file.
- *
- * To customize the configuration:
- * - Create a settings.local.php
- * - Edit the templates at .the-build/drupal/settings.*.php
- * - Avoid editing this file
- *
- * @see https://api.drupal.org/api/drupal/sites%21default%21default.settings.php/8.6.x
- */
-
-
-// This is the core set of defaults from default.settings.php. They will be overridden
-// as necessary by the includes below.
-$settings['hash_salt'] = '';
-$settings['update_free_access'] = FALSE;
-$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
-$settings['file_scan_ignore_directories'] = [
-  'node_modules',
-  'bower_components',
-];
-$settings['entity_update_batch_size'] = 50;
-
-
-// Disable our three default config_split configurations. These will be enabled in the
-// settings.build.php file that is compiled for either development or for the artifact.
-$config['config_split.config_split.production']['status'] = FALSE;
-$config['config_split.config_split.staging']['status'] = FALSE;
-$config['config_split.config_split.development']['status'] = FALSE;
-
-
-// Additional settings files to load. Order is significant.
-$settings_filenames = [
-  // Host-specific settings.
-  'settings.${build.host}.php',
-  // Settings file generated by palantirnet/the-build
-  'settings.build.php',
-  // Local settings file for use on individual developer environments
-  'settings.local.php',
-];
-
-// Load each settings file that is present, in the order specified above.
-foreach ($settings_filenames as $settings_filename) {
-  $settings_file = "{$app_root}/{$site_path}/{$settings_filename}";
-  if (file_exists($settings_file)) {
-    include $settings_file;
-  }
-}

From ed303f7fa0be0b0c225d7399a669b0b2f35a0811 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Fri, 27 Jan 2023 19:57:19 -0500
Subject: [PATCH 2/9] Delete settings.acquia.php

---
 .../install_site/drupal/settings.acquia.php    | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 defaults/install_site/drupal/settings.acquia.php

diff --git a/defaults/install_site/drupal/settings.acquia.php b/defaults/install_site/drupal/settings.acquia.php
deleted file mode 100644
index 0bf60ccd..00000000
--- a/defaults/install_site/drupal/settings.acquia.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @file
- * Drupal settings file for use with Acquia hosted sites.
- *
- * This file should be loaded on all environments, Acquia or not, since the settings here
- * will affect the behavior of the site.
- */
-
-$config['acquia_connector.settings']['hide_signup_messages'] = TRUE;
-
-$settings['cache']['default'] = 'cache.backend.database';
-
-// Include the Acquia database connection and other config.
-if (file_exists('/var/www/site-php')) {
-  require "/var/www/site-php/{$_ENV['AH_SITE_GROUP']}/{$_ENV['AH_SITE_GROUP']}-settings.inc";
-}

From 1d29042ae302d73efe06be965c6c85f1826738d1 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Fri, 27 Jan 2023 19:58:37 -0500
Subject: [PATCH 3/9] update defaults directory readme

---
 defaults/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/defaults/README.md b/defaults/README.md
index 43a70f28..0fef1430 100644
--- a/defaults/README.md
+++ b/defaults/README.md
@@ -4,5 +4,4 @@
 |---|---|
 | `artifact/` | Default files used in build artifacts. Override these by editing the `artifact.gitignore_template` and `artifact.readme_template` in your project's properties. |
 | `install/` | Templates used when installing the-build into a project. |
-| `install_site/` | Templates used when adding a multisite to a project with the `phing drupal-add-multisite` command. |
 | `standard/` | Configuration files and a module that are referenced directly by the-build. |

From 805ff37084636c44f66e656a4c06236830125aa8 Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 3 Mar 2023 16:25:50 -0500
Subject: [PATCH 4/9] Try setting the dir

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index 3636b0f1..a590e9e5 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -10,7 +10,7 @@
 <project name="install" default="install">
 
     <!-- This is required to set ${composer.composer} for installing for Platform.sh -->
-    <import file="the-build.xml" />
+    <import file="${phing.dir}/the-build.xml" />
 
     <property name="build.dir" value="${application.startdir}" />
     <property name="build.env" value="default" />

From 09bd8ddfd653db58a8f60bef50ae85272be96b57 Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 3 Mar 2023 16:30:37 -0500
Subject: [PATCH 5/9] Try a local . path

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index a590e9e5..99b26da4 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -10,7 +10,7 @@
 <project name="install" default="install">
 
     <!-- This is required to set ${composer.composer} for installing for Platform.sh -->
-    <import file="${phing.dir}/the-build.xml" />
+    <import file="./the-build.xml" />
 
     <property name="build.dir" value="${application.startdir}" />
     <property name="build.env" value="default" />

From 8ba2c7565fb8e331458c314d22c46dd4dccd82bf Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 3 Mar 2023 16:42:00 -0500
Subject: [PATCH 6/9] Try using a symlink

---
 .circleci/config.yml | 6 ++++--
 targets/install.xml  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ac76ad2..d383ccf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,10 +114,12 @@ jobs:
           paths:
             - ~/.cache/composer
 
-      # Add a multisite
+      # Add a multisite. The symlink prevents a file include error.
       - run:
           name: Add a multisite to the project
-          command: printf 'intranet\nintranet.example.ddev.site' | vendor/bin/phing drupal-add-multisite
+          command: |
+            ln -S vendor/palantirnet/the-build/targets/the-build.xml the-build.xml
+            printf 'intranet\nintranet.example.ddev.site' | vendor/bin/phing drupal-add-multisite
           working_directory: ~/example
 
       - run:
diff --git a/targets/install.xml b/targets/install.xml
index 99b26da4..3636b0f1 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -10,7 +10,7 @@
 <project name="install" default="install">
 
     <!-- This is required to set ${composer.composer} for installing for Platform.sh -->
-    <import file="./the-build.xml" />
+    <import file="the-build.xml" />
 
     <property name="build.dir" value="${application.startdir}" />
     <property name="build.env" value="default" />

From 9799c2af179ca7b693695e52f5766e0a808e9e9d Mon Sep 17 00:00:00 2001
From: Ken Rickard <agentrickard@gmail.com>
Date: Fri, 3 Mar 2023 16:44:53 -0500
Subject: [PATCH 7/9] Ignore the include failure

---
 .circleci/config.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d383ccf7..5ac76ad2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -114,12 +114,10 @@ jobs:
           paths:
             - ~/.cache/composer
 
-      # Add a multisite. The symlink prevents a file include error.
+      # Add a multisite
       - run:
           name: Add a multisite to the project
-          command: |
-            ln -S vendor/palantirnet/the-build/targets/the-build.xml the-build.xml
-            printf 'intranet\nintranet.example.ddev.site' | vendor/bin/phing drupal-add-multisite
+          command: printf 'intranet\nintranet.example.ddev.site' | vendor/bin/phing drupal-add-multisite
           working_directory: ~/example
 
       - run:

From 16226f8f980ea9195820864c02a144d96f812463 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Fri, 23 Jun 2023 16:23:45 -0400
Subject: [PATCH 8/9] try phing.dir.install

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index 3636b0f1..ace86a10 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -10,7 +10,7 @@
 <project name="install" default="install">
 
     <!-- This is required to set ${composer.composer} for installing for Platform.sh -->
-    <import file="the-build.xml" />
+    <import file="${phing.dir.install}/the-build.xml" />
 
     <property name="build.dir" value="${application.startdir}" />
     <property name="build.env" value="default" />

From 0d4e3124bddbb7021ee4d74965ac7d14a00fd13f Mon Sep 17 00:00:00 2001
From: Byron Duvall <duvall@palantir.net>
Date: Fri, 23 Jun 2023 16:55:02 -0400
Subject: [PATCH 9/9] Revert "try phing.dir.install"

This reverts commit 16226f8f980ea9195820864c02a144d96f812463.
---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index ace86a10..3636b0f1 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -10,7 +10,7 @@
 <project name="install" default="install">
 
     <!-- This is required to set ${composer.composer} for installing for Platform.sh -->
-    <import file="${phing.dir.install}/the-build.xml" />
+    <import file="the-build.xml" />
 
     <property name="build.dir" value="${application.startdir}" />
     <property name="build.env" value="default" />