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

Update Composer, update everything

Browse source
This commit is contained in:
Oliver Davies 2018-11-23 12:29:20 +00:00
parent ea3e94409f
commit dda5c284b6
19527 changed files with 1135420 additions and 351004 deletions
Download patch file Download diff file Expand all files Collapse all files

11
web/sites/default/settings.php
View file

@ -25,6 +25,14 @@ $config_directories = array(
CONFIG_SYNC_DIRECTORY => dirname(DRUPAL_ROOT) . '/config',
);
/**
* If there is a local settings file, then include it
*/
$docker_settings = __DIR__ . "/settings.docker.php";
if (file_exists('/.dockerenv') && file_exists($docker_settings)) {
include $docker_settings;
}
/**
* If there is a local settings file, then include it
*/
@ -32,3 +40,6 @@ $local_settings = __DIR__ . "/settings.local.php";
if (file_exists($local_settings)) {
include $local_settings;
}
$settings['hash_salt'] = 'werewr';