opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Related to #74: Unify settings.php and default.settings.php.

Browse source
This commit is contained in:
Greg Anderson 2015-10-14 15:23:53 -07:00
parent f32e58e4b1
commit 4fc8d03142
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sites/default/default.settings.php
View file

@ -669,6 +669,17 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
* example.org, with all subdomains included.
*/
/**
* Include the Pantheon-specific settings file.
*
* n.b. The settings.pantheon.php file makes some changes
* that affect all envrionments that this site
* exists in. Always include this file, even in
* a local development environment, to insure that
* the site settings remain consistent.
*/
include __DIR__ . "/settings.pantheon.php";
/**
* Load local development override configuration, if available.
*
@ -679,6 +690,6 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
*
* Keep this code block at the end of this file to take full effect.
*/
# if (file_exists(__DIR__ . '/settings.local.php')) {
# include __DIR__ . '/settings.local.php';
# }
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
}

29
sites/default/settings.php
View file

@ -1,5 +1,20 @@
<?php
/**
* @file
* Drupal site-specific configuration file.
*
* This is the standard settings file provided by default
* for Drupal sites running on the Pantheon platform.
* This file will not be changed in updated versions, so
* you may place your customizations here without causing
* merge conflicts during upgrades.
*
* See default.settings.php for more configuration options.
* You may copy the default.settings.php file over this
* file if you wish.
*/
/**
* Load services definition file.
*/
@ -17,9 +32,15 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
include __DIR__ . "/settings.pantheon.php";
/**
* If there is a local settings file, then include it
* Load local development override configuration, if available.
*
* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing emails, and
* other things that should not happen on development and testing sites.
*
* Keep this code block at the end of this file to take full effect.
*/
$local_settings = __DIR__ . "/settings.local.php";
if (file_exists($local_settings)) {
include $local_settings;
if (file_exists(__DIR__ . '/settings.local.php')) {
include __DIR__ . '/settings.local.php';
}