diff --git a/scripts/deploy.sh b/scripts/deploy.sh index c3447fa..fa07459 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -17,4 +17,4 @@ find . -mindepth 2 -type d -name ".git" -exec rm -rf {} + git add -A git commit -m "Automated Artifact Build." -git push origin $DESTINATION_BRANCH --dry-run +git push origin $DESTINATION_BRANCH diff --git a/scripts/rsync-exclude.txt b/scripts/rsync-exclude.txt index 1be95c8..cbe5562 100644 --- a/scripts/rsync-exclude.txt +++ b/scripts/rsync-exclude.txt @@ -1,9 +1,10 @@ .ddev +settings.ddev.php +development.services.yml .phpunit.cache .git .gitmodules .git/modules/* -sites/default/files private-files vendor node_modules diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 6d0ba7b..a734e57 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -772,7 +772,10 @@ * * @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings */ -# $settings['trusted_host_patterns'] = []; +$settings['trusted_host_patterns'] = [ + '^www\.danchadwick\.dev$', + '^danchadwick\.dev$' +]; /** * The default list of directories that will be ignored by Drupal's file API. @@ -882,28 +885,11 @@ # include $app_root . '/' . $site_path . '/settings.local.php'; # } -/* $databases['default']['default'] = array ( */ -/* 'database' => 'dchadwick', */ -/* 'username' => 'dchadwick', */ -/* 'password' => 'k0aptd8I', */ -/* 'prefix' => '', */ -/* 'host' => 'localhost', */ -/* 'port' => '3306', */ -/* 'isolation_level' => 'READ COMMITTED', */ -/* 'driver' => 'mysql', */ -/* 'namespace' => 'Drupal\\mysql\\Driver\\Database\\mysql', */ -/* 'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/', */ -/* ); */ - $databases['default']['default'] = [ 'driver' => 'sqlite', 'database' => 'db/db.sqlite', ]; -if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { - include $app_root . '/' . $site_path . '/settings.local.php'; -} - $settings['file_public_path'] = 'sites/default/files'; $settings['file_private_path'] = $app_root . '/../private-files'; $config['image.settings']['allow_insecure_derivatives'] = TRUE;