diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc5f97d3..c8b11192 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
# Change Log
+## 4.0-alpha1
+
+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
### Fixed
diff --git a/README.md b/README.md
index a2f7dd19..1672e826 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ $> vendor/bin/the-build-installer
This will trigger an interactive prompt to configure your basic build properties, adding the following templated files and directories:
* `.circleci/`
-* `.gitignore`
* `.the-build/`
* `behat.yml`
* `build.xml`
diff --git a/defaults.yml b/defaults.yml
index 4454f580..79c45968 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -14,13 +14,14 @@
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:
# 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"
@@ -52,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}.local"
+ # 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
@@ -109,9 +111,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:
@@ -240,7 +242,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 653311a5..209c358c 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -43,21 +43,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -175,7 +160,7 @@
-
+
Find more documentation for palantirnet/the-build on GitHub:
https://github.com/palantirnet/the-build#using-the-build
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 @@
- '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/gitignore b/defaults/install/gitignore
deleted file mode 100644
index a731a2a0..00000000
--- a/defaults/install/gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# This file should contain only rules that are specific to this project. For
-# ignoring OS and IDE metadata files, please configure a global gitignore on
-# your local machine.
-# @see https://github.com/sb2nov/mac-setup/blob/master/Git/gitignore.md
-
-# Include Drupal settings files
-!/${drupal.root}/sites/*/settings.php
-!/${drupal.root}/sites/*/services.yml
-
-# Ignore local and generated settings files
-/${drupal.root}/sites/*/settings.local.php
-/${drupal.root}/sites/*/settings.build.php
-/${drupal.root}/sites/*/services.build.yml
-
-# Ignore theme assets copied from the styleguide
-/${drupal.root}/themes/custom/*/css/
-/${drupal.root}/themes/custom/*/js/
-/${drupal.root}/themes/custom/*/svg/
-/${drupal.root}/themes/custom/*/imgs/
-
-# Ignore Drupal files
-/${drupal.root}/sites/*/files/
-
-# Ignore Drupal contrib downloaded by Composer
-/drush/contrib/
-/${drupal.root}/core/
-/${drupal.root}/modules/contrib/
-/${drupal.root}/themes/contrib/
-/${drupal.root}/profiles/contrib/
-
-# Ignore regular Composer dependencies
-/vendor/
-
-# Ignore virtual environment and artifacts
-.vagrant/
-/artifacts/
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
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/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 578b9d44..3796640e 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -28,14 +28,28 @@
-->
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -48,6 +62,12 @@
+
+
+
+
+
+
@@ -82,38 +102,35 @@
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -180,17 +171,11 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -231,55 +216,43 @@
$> phing test
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
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 @@
+
+