Add content tests in TestDdevFullSiteSetup, fixes #677

.circleci/circle_vm_setup.sh

@@ -6,7 +6,7 @@ set -x
 # Basic tools
 
 sudo apt-get update -qq
-sudo apt-get install -qq mysql-client realpath zip nsis
+sudo apt-get install -qq mysql-client realpath zip nsis jq
 
 # golang of the version we want
 sudo apt-get remove -qq golang && sudo rm -rf /usr/local/go &&

containers/ddev-dbserver/files/etc/my.cnf

@@ -76,8 +76,9 @@ innodb_file_per_table=true
 
 # LOGGING #
 log-error                      = /var/log/mysqld.err
-log-queries-not-using-indexes  = 1
+log-queries-not-using-indexes  = 0
 slow-query-log                 = 1
-slow-query-log-file            = /var/lib/mysql/mysql-slow.log
+slow-query-log-file            = /var/log/mysqld.err
+long-query-time                = 10
 
 !includedir /etc/mysql/conf.d

containers/ddev-webserver/files/healthcheck.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-# nginx and php-fpm healthcheck
+# ddev-webserver healthcheck
 
 set -eo pipefail
 
-curl --fail localhost/phpstatus
-curl --fail localhost:8025 >/dev/null 2>&1
+curl --fail -s localhost/phpstatus >/dev/null && printf "phpstatus: OK, " || (printf "phpstatus FAILED" && exit 1)
+ls /var/www/html >/dev/null && printf "/var/www/html: OK, " || (printf "/var/www/html access FAILED" && exit 2)
+curl --fail -s localhost:8025 >/dev/null && printf "mailhog: OK" || (printf "mailhog FAILED" && exit 3)

containers/ddev-webserver/files/start.sh

@@ -87,6 +87,8 @@ if [ "$DDEV_XDEBUG_ENABLED" != "true" ]; then
     disable_xdebug
 fi
 
+ls /var/www/html >/dev/null || (echo "/var/www/html does not seem to be healthy/mounted; docker may not be mounting it., exiting" && exit 101)
+
 echo 'Server started'
 
 exec /usr/bin/supervisord -n -c "/etc/supervisor/supervisord-${DDEV_WEBSERVER_TYPE}.conf"

pkg/ddevapp/backdrop.go

@@ -52,6 +52,11 @@ func NewBackdropSettings() *BackdropSettings {
 const backdropMainSettingsTemplate = `<?php
 {{ $config := . }}
 // {{ $config.Signature }}: Automatically generated Backdrop settings file.
+
+// Providing these in the main settings file is most likely to match the default config_directories.
+$database = 'mysql://user:pass@localhost/database_name';
+$config_directories['active'] = 'files/config_' . md5($database) . '/active';
+$config_directories['staging'] = 'files/config_' . md5($database) . '/staging';
 if (file_exists(__DIR__ . '/{{ $config.SiteSettingsLocal }}')) {
   include __DIR__ . '/{{ $config.SiteSettingsLocal }}';
 }