Bugfix for failure to include custom config in wp config, fixes #78 (#79)

Co-authored-by: Jake Paris <[email protected]>

Author: jakeparis

README.md

@@ -134,6 +134,9 @@ ddev exec npm run watch
 
 ### WordPress Configuration Changes
 
+When this add-on is added to a WordPress project, DDEV's management of the installation files is turned
+off. 
+
 The changes this add-on makes to the `wp-config-ddev.php` file during installation can be seen below.
 
 The `wp-config-ddev-browserync.php` file is included before the `/** WP_HOME URL */` comment.

install.yaml

@@ -34,10 +34,23 @@ post_install_actions:
     #ddev-nodisplay
     #ddev-description:Install browsersync settings for WordPress if applicable
     scripts/setup-wordpress-settings.sh
+  - |
+    #ddev-nodisplay
+    #ddev-description:Check for WordPress and disable ddev management of wp-config file
+    if [[ $DDEV_PROJECT_TYPE = 'wordpress' ]]; then 
+      ddev config --disable-settings-management=true;
+    fi
+
 
 removal_actions:
   - |
     #ddev-nodisplay
     #ddev-description:Remove browsersync settings for WordPress if applicable
     rm -f "${DDEV_APPROOT}/wp-config-ddev-browsersync.php"
     scripts/remove-wordpress-settings.sh
+  # Don't automatically renable settings management in case user didn't have it enabled in the first place
+  - |
+    if [[ $DDEV_PROJECT_TYPE = 'wordpress' ]]; then 
+      echo "Note: You may wish to renable ddev's management of the wp-config file:"
+      echo "     Run 'ddev config --disable-settings-management=false && ddev restart'"
+    fi

scripts/remove-wordpress-settings.sh

@@ -7,9 +7,9 @@ then
   exit 0
 fi
 
-if ( ddev debug configyaml 2>/dev/null | grep 'disable_settings_management:\s*true' >/dev/null 2>&1 ) ; then
-  exit 0
-fi
+# if ( ddev debug configyaml 2>/dev/null | grep 'disable_settings_management:\s*true' >/dev/null 2>&1 ) ; then
+#   exit 0
+# fi
 
 SETTINGS_FILE_NAME="${DDEV_APPROOT}/wp-config.php"
 

scripts/setup-wordpress-settings.sh

@@ -7,9 +7,9 @@ then
   exit 0
 fi
 
-if ( ddev debug configyaml 2>/dev/null | grep 'disable_settings_management:\s*true' >/dev/null 2>&1 ) ; then
-  exit 0
-fi
+# if ( ddev debug configyaml 2>/dev/null | grep 'disable_settings_management:\s*true' >/dev/null 2>&1 ) ; then
+#   exit 0
+# fi
 
 cp scripts/wp-config-ddev-browsersync.php $DDEV_APPROOT/
 
@@ -23,18 +23,17 @@ if grep -q "/\*\* Include for ddev-browsersync to modify WP_HOME and WP_SITEURL.
 fi
 
 echo "Adding wp-config-ddev-browsersync.php to: ${SETTINGS_FILE_NAME}"
-
+ 
 # Append our code before the ddev config comment.
 awk '
-/\/\/ Include for ddev-managed settings in wp-config-ddev.php./ {
+/\/\/ Include for settings managed by ddev./ {
     print "/** Include for ddev-browsersync to modify WP_HOME and WP_SITEURL. */"
     print "$ddev_browsersync_settings = dirname( __FILE__ ) . \"/wp-config-ddev-browsersync.php\";"
-    print ""
     print "if ( is_readable( $ddev_browsersync_settings ) ) {"
     print "    require_once( $ddev_browsersync_settings );"
     print "}"
     print ""
-    print "// Include for ddev-managed settings in wp-config-ddev.php."
+    print "// Include for settings managed by ddev."
     next
 }
 {print}