From 34a2167b0a8547553938129abece6187af65899a Mon Sep 17 00:00:00 2001
From: Leonid Makarov <leonid.makarov@ffwagency.com>
Date: Mon, 9 May 2022 16:47:23 -0700
Subject: [PATCH] Updated and simplified Drupal settings files

---
 .docksal/commands/init-site                   | 10 +----
 .gitignore                                    |  5 +--
 .../sites/default/default.settings.local.php  | 39 ++++++++++++++++---
 .../sites/default}/settings.php               |  0
 4 files changed, 38 insertions(+), 16 deletions(-)
 rename .docksal/settings/settings.local.php => web/sites/default/default.settings.local.php (76%)
 rename {.docksal/settings => web/sites/default}/settings.php (100%)

diff --git a/.docksal/commands/init-site b/.docksal/commands/init-site
index d45e535..3a31241 100755
--- a/.docksal/commands/init-site
+++ b/.docksal/commands/init-site
@@ -63,14 +63,8 @@ composer_install ()
 # Initialize local settings files
 init_settings ()
 {
-	# drupal-composer/drupal-project creates settings.php from default.settings.php.
-	# Since we supply our own settings.php below, we have to drop the default file first.
-	# TODO: Uncomment the local config (settings.local.php) include section in settings.php inline instead.
-	# That'a the only change we need in the stock settings.php
-	rm -f "${SITEDIR_PATH}/settings.php"
-
-	copy_settings_file "${PROJECT_ROOT}/.docksal/settings/settings.php" "${SITEDIR_PATH}/settings.php"
-	copy_settings_file "${PROJECT_ROOT}/.docksal/settings/settings.local.php" "${SITEDIR_PATH}/settings.local.php"
+	# Copy from settings templates
+	copy_settings_file "${SITEDIR_PATH}/default.settings.local.php" "${SITEDIR_PATH}/settings.local.php"
 }
 
 # Fix file/folder permissions
diff --git a/.gitignore b/.gitignore
index f2f1d35..62ecabc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,7 @@
 /web/profiles/contrib/
 /web/libraries/
 
-# Ignore sensitive information
-/web/sites/*/settings.php
+# Ignore local settings
 /web/sites/*/settings.local.php
 
 # Ignore Drupal's file directory
@@ -21,4 +20,4 @@
 /.idea/
 
 # Ignore .env files as they are personal
-/.env
\ No newline at end of file
+/.env
diff --git a/.docksal/settings/settings.local.php b/web/sites/default/default.settings.local.php
similarity index 76%
rename from .docksal/settings/settings.local.php
rename to web/sites/default/default.settings.local.php
index e87004b..cc708b5 100644
--- a/.docksal/settings/settings.local.php
+++ b/web/sites/default/default.settings.local.php
@@ -1,6 +1,6 @@
 <?php
 
-// @codingStandardsIgnoreFile
+// phpcs:ignoreFile
 
 /**
  * @file
@@ -130,15 +130,44 @@
  */
 $settings['skip_permissions_hardening'] = TRUE;
 
+/**
+ * Exclude modules from configuration synchronization.
+ *
+ * On config export sync, no config or dependent config of any excluded module
+ * is exported. On config import sync, any config of any installed excluded
+ * module is ignored. In the exported configuration, it will be as if the
+ * excluded module had never been installed. When syncing configuration, if an
+ * excluded module is already installed, it will not be uninstalled by the
+ * configuration synchronization, and dependent configuration will remain
+ * intact. This affects only configuration synchronization; single import and
+ * export of configuration are not affected.
+ *
+ * Drupal does not validate or sanity check the list of excluded modules. For
+ * instance, it is your own responsibility to never exclude required modules,
+ * because it would mean that the exported configuration can not be imported
+ * anymore.
+ *
+ * This is an advanced feature and using it means opting out of some of the
+ * guarantees the configuration synchronization provides. It is not recommended
+ * to use this feature with modules that affect Drupal in a major way such as
+ * the language or field module.
+ */
+# $settings['config_exclude_modules'] = ['devel', 'stage_file_proxy'];
+
 
 // Docksal DB connection settings.
-$databases['default']['default'] = [
-  'database' => 'default',
+$databases['default']['default'] = array (
+  'database' => getenv('MYSQL_DATABASE'),
   'username' => getenv('MYSQL_USER'),
   'password' => getenv('MYSQL_PASSWORD'),
-  'host' => 'db',
+  'host' => getenv('MYSQL_HOST'),
+  'port' => '3306',
   'driver' => 'mysql',
-];
+);
+
+// This needs to be includes here otherwise installing a site from scratch will
+// write both salt AND local DB setting into settings.php (which we don't want).
+$settings['hash_salt'] = 'WSwxSIzzqrBEA98wSWtJBYOT-MeBzbM9cmkALiKm-d-8TC0mz-ksCzMmx15Y62vbzQgwP1u3ug';
 
 // Workaround for permission issues with NFS shares
 $settings['file_chmod_directory'] = 0777;
diff --git a/.docksal/settings/settings.php b/web/sites/default/settings.php
similarity index 100%
rename from .docksal/settings/settings.php
rename to web/sites/default/settings.php