From 6667ff30d702032a79aa9892754abc0c37280e56 Mon Sep 17 00:00:00 2001
From: andrewbelcher <andrewbelcher@655282.no-reply.drupal.org>
Date: Thu, 11 Dec 2025 13:36:50 +0000
Subject: [PATCH] Manage DDEV and DevPanel settings to ensure config sync dir.

---
 .devpanel/composer_setup.sh     | 10 ------
 .devpanel/drupal-settings.patch | 18 -----------
 .gitignore                      |  1 -
 web/sites/default/settings.php  | 54 +++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 29 deletions(-)
 delete mode 100644 .devpanel/drupal-settings.patch
 create mode 100755 web/sites/default/settings.php

diff --git a/.devpanel/composer_setup.sh b/.devpanel/composer_setup.sh
index 0a3b485..4d0dc0c 100755
--- a/.devpanel/composer_setup.sh
+++ b/.devpanel/composer_setup.sh
@@ -12,13 +12,3 @@ composer require -n --no-plugins --no-update drush/drush cweagans/composer-patch
 
 # Programmatically fix Composer 2.2 allow-plugins to avoid errors
 composer config --no-plugins allow-plugins.cweagans/composer-patches true
-
-# Scaffold settings.php.
-composer config --no-plugins -jm extra.drupal-scaffold.file-mapping '{
-    "[web-root]/sites/default/settings.php": {
-        "path": "web/core/assets/scaffold/files/default.settings.php",
-        "overwrite": false
-    }
-}'
-composer config --no-plugins scripts.post-drupal-scaffold-cmd \
-    'cd web/sites/default && (test -n "$(grep '\''include \$devpanel_settings;'\'' settings.php)" || patch -Np1 -r /dev/null < $APP_ROOT/.devpanel/drupal-settings.patch || :)'
diff --git a/.devpanel/drupal-settings.patch b/.devpanel/drupal-settings.patch
deleted file mode 100644
index d4f7baf..0000000
--- a/.devpanel/drupal-settings.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/settings.php b/settings.php
-index cd364bb00df..493885f088b 100644
---- a/settings.php
-+++ b/settings.php
-@@ -854,6 +854,13 @@
- # $settings['migrate_file_public_path'] = '';
- # $settings['migrate_file_private_path'] = '';
-
-+/**
-+ * Load DevPanel override configuration, if available.
-+ */
-+if (getenv('DP_APP_ID') !== FALSE && file_exists(dirname($app_root) . '/.devpanel/settings.devpanel.php')) {
-+  include dirname($app_root) . '/.devpanel/settings.devpanel.php';
-+}
-+
- /**
-  * Load local development override configuration, if available.
-  *
diff --git a/.gitignore b/.gitignore
index ad896fa..c6a3ac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@
 /web/libraries/
 
 # Ignore sensitive configuration files
-/web/sites/*/settings.php
 /web/sites/*/settings.local.php
 /web/sites/*/services.yml
 /web/sites/*/services.local.yml
diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php
new file mode 100755
index 0000000..fc91b2a
--- /dev/null
+++ b/web/sites/default/settings.php
@@ -0,0 +1,54 @@
+<?php
+
+// phpcs:ignoreFile
+
+/**
+ * @file
+ * Drupal site-specific configuration file.
+ */
+
+/**
+ * Load services definition file.
+ */
+$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
+
+/**
+ * The default list of directories that will be ignored by Drupal's file API.
+ *
+ * By default ignore node_modules and bower_components folders to avoid issues
+ * with common frontend tools and recursive scanning of directories looking for
+ * extensions.
+ *
+ * @see \Drupal\Core\File\FileSystemInterface::scanDirectory()
+ * @see \Drupal\Core\Extension\ExtensionDiscovery::scanDirectory()
+ */
+$settings['file_scan_ignore_directories'] = [
+  'node_modules',
+  'bower_components',
+];
+
+/**
+ * Location of the site configuration files.
+ */
+$settings['config_sync_directory'] = '../config/sync';
+
+/**
+ * Include DDEV settings.
+ */
+if (getenv('IS_DDEV_PROJECT') == 'true' && file_exists(__DIR__ . '/settings.ddev.php')) {
+  include __DIR__ . '/settings.ddev.php';
+}
+
+/**
+ * Load DevPanel override configuration, if available.
+ */
+if (getenv('DP_APP_ID') !== FALSE && file_exists(dirname($app_root) . '/.devpanel/settings.devpanel.php')) {
+  include dirname($app_root) . '/.devpanel/settings.devpanel.php';
+}
+
+/**
+ * Load local development override configuration, if available.
+ */
+if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
+  include $app_root . '/' . $site_path . '/settings.local.php';
+}