From 773e8d37e446738585ab9b4d21263cfee3a5b78f Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 21 Jan 2021 17:59:39 -0600 Subject: [PATCH 01/16] Use ddev database creds by default. --- defaults.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults.yml b/defaults.yml index 4454f580..4d304b25 100644 --- a/defaults.yml +++ b/defaults.yml @@ -109,9 +109,9 @@ drupal: database: # This value is required, but a default is set in the-build.xml. # database: drupal - username: root - password: root - host: 127.0.0.1 + username: db + password: db + host: db # Configuration used by the default 'build' target. build: From 3b7a6e3ac0727f0eb91fa15b6eb7b38b3a2e96dd Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 21 Jan 2021 18:00:44 -0600 Subject: [PATCH 02/16] Use the default ddev URL pattern. --- defaults.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults.yml b/defaults.yml index 4d304b25..e0779d39 100644 --- a/defaults.yml +++ b/defaults.yml @@ -53,7 +53,7 @@ drupal: # REQUIRED: Your site's URI; the default should be the URI of your local # development environment. - uri: "https://${projectname}.local" + uri: "https://${projectname}.ddev.site" # Customizing the following values is OPTIONAL. If these values are not # explicitly configured, they will be set in the-build.xml based on the From 052e3127a48487f2283bdfecdb371ff7b22dbd13 Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 21 Jan 2021 17:48:51 -0600 Subject: [PATCH 03/16] Fix phing list when phing needs to be called with 'vendor/bin/phing' --- defaults/install/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/build.xml b/defaults/install/build.xml index 563e8149..0bf4ce68 100644 --- a/defaults/install/build.xml +++ b/defaults/install/build.xml @@ -175,7 +175,7 @@ + + - + + + From e11a9ce2ec43fbfa68ddcc1b9bd914c86f9022a1 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 18:47:20 -0500 Subject: [PATCH 06/16] Fix web root rewriting up a bit. --- defaults.yml | 3 ++- targets/install.xml | 57 +++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/defaults.yml b/defaults.yml index 6419ae62..1823997f 100644 --- a/defaults.yml +++ b/defaults.yml @@ -20,7 +20,8 @@ build: drupal: # Relative path to the Drupal web root. This is co-dependent with the composer installer # configuration in your `composer.json`. Use caution when changing this value. - root: web + # **This is a required value but must be set in a project's own build.yml file** + #root: web # Comma-separated list of directories that should be present for Drupal development. create_dirs: "${drupal.root}/modules/custom,${drupal.root}/themes/custom,${drupal.root}/profiles/custom,config/config_split/development,config/config_split/staging,config/config_split/production" diff --git a/targets/install.xml b/targets/install.xml index 39e909c1..25c75bd1 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -88,38 +88,35 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + From ac540d98e367119250d9b62fcc89344fcef9df58 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 19:20:10 -0500 Subject: [PATCH 08/16] When re-running the-build-installer, use existing config as the defaults first. --- targets/install.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/targets/install.xml b/targets/install.xml index 2c7e3d22..e7895b47 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -28,6 +28,7 @@ --> + From 8f3458f2036e63e26d7704a4661ad389d11d14dd Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 19:20:29 -0500 Subject: [PATCH 09/16] Write the hash salt to a file instead. --- targets/install.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/install.xml b/targets/install.xml index e7895b47..4f840e69 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -34,7 +34,7 @@ - + From a3c405639088444fb2b88d0f37557958fb616e2e Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 19:26:36 -0500 Subject: [PATCH 10/16] Explanatory note in the changelog. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ed0e8ad..6fd3cc5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ ## LITE +The goal of this release is to remove some of the templating functionality that makes the-build and drupal-skeleton harder to use and maintain. + * Removed gitignore template +* Removed settings.php templating ## 3.0.3 - November 25, 2020 From 4925b85d6a78e9664baafdd48ca6503006dd8777 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 19:50:25 -0500 Subject: [PATCH 11/16] Fix usage of project defaults. --- targets/install.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/targets/install.xml b/targets/install.xml index 4f840e69..c806fe67 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -28,7 +28,14 @@ --> - + + + + + + + + From d9c4179085e3316ad8352ecdd5c91b307afa7be3 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 3 Sep 2021 19:50:37 -0500 Subject: [PATCH 12/16] Fix creation of salt file. --- targets/install.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/targets/install.xml b/targets/install.xml index c806fe67..b4b91ee0 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -41,6 +41,7 @@ + From 7e8a69e4bfcbfdf489451d8425df91aeedcf2827 Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 9 Sep 2021 10:39:04 -0500 Subject: [PATCH 13/16] Update Pantheon PHP version. --- defaults/install/pantheon.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/install/pantheon.yml b/defaults/install/pantheon.yml index a3cad717..d20d944c 100644 --- a/defaults/install/pantheon.yml +++ b/defaults/install/pantheon.yml @@ -1,5 +1,5 @@ # Pantheon configuration file api_version: 1 web_docroot: true -php_version: 7.2 +php_version: 7.4 drush_version: 8 From 8f5beee9930e9d503c7b25d14765e7be6a40725f Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 9 Sep 2021 11:33:06 -0500 Subject: [PATCH 14/16] Download Acquia memcache config during hosting setup. --- targets/install.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/targets/install.xml b/targets/install.xml index b4b91ee0..84479d7f 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -215,6 +215,12 @@ + + + + + + From 6a17669a8e4a40a7986a8849e9424e773f48e29d Mon Sep 17 00:00:00 2001 From: Bec White Date: Thu, 9 Sep 2021 11:55:29 -0500 Subject: [PATCH 15/16] Set the site name property as part of the build installer process, so that you don't end up with 'html' when you install from within ddev. --- defaults.yml | 5 +++-- defaults/install/the-build/build.yml | 2 ++ targets/install.xml | 5 +++++ targets/the-build.xml | 5 ++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/defaults.yml b/defaults.yml index 1823997f..79c45968 100644 --- a/defaults.yml +++ b/defaults.yml @@ -53,8 +53,9 @@ drupal: dir: default # REQUIRED: Your site's URI; the default should be the URI of your local - # development environment. - uri: "https://${projectname}.ddev.site" + # development environment. This must be present in your + # .the-build/build.yml file. +# uri: "https://${projectname}.ddev.site" # Customizing the following values is OPTIONAL. If these values are not # explicitly configured, they will be set in the-build.xml based on the diff --git a/defaults/install/the-build/build.yml b/defaults/install/the-build/build.yml index e50c19cc..29486bb0 100644 --- a/defaults/install/the-build/build.yml +++ b/defaults/install/the-build/build.yml @@ -5,6 +5,8 @@ # found in the-build's repository. # @see https://github.com/palantirnet/the-build/blob/release-2.0/defaults.yml +projectname: ${projectname} + # These properties are used when building the settings.php and settings.yml for your # Drupal site, and by some of the targets in the default build.xml file. # @see .the-build/drupal/services.build.yml diff --git a/targets/install.xml b/targets/install.xml index 84479d7f..3796640e 100644 --- a/targets/install.xml +++ b/targets/install.xml @@ -44,7 +44,12 @@ + + + + + diff --git a/targets/the-build.xml b/targets/the-build.xml index 53e0038f..da0a7e57 100644 --- a/targets/the-build.xml +++ b/targets/the-build.xml @@ -34,9 +34,6 @@ - - - @@ -87,6 +84,8 @@ + + From 2195020dc6475834f31f16e3327549db95b0b7a1 Mon Sep 17 00:00:00 2001 From: Bec White Date: Fri, 15 Oct 2021 09:55:15 -0500 Subject: [PATCH 16/16] Update the changelog. --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fd3cc5d..c8b11192 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,16 @@ # Change Log -## LITE +## 4.0-alpha1 -The goal of this release is to remove some of the templating functionality that makes the-build and drupal-skeleton harder to use and maintain. +The goal of this release is to remove some of the templating functionality that makes `planaitrnet/the-build` and `palantirnet/drupal-skeleton` harder to use and maintain. * Removed gitignore template * Removed settings.php templating +* Changed how host-specific settings files are managed + +`palantirnet/drupal-skeleton` now contains the `settings.php` scaffolding for Drupal. + +The plan is to remove more templating/wrapping before releasing 4.0. ## 3.0.3 - November 25, 2020