opdavies/oliverdavies.uk-drupal-old
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Stop overriding the config path

Browse source
This commit is contained in:
Oliver Davies 2020-05-10 01:44:18 +01:00
parent b94c0ac1a6
commit 314ba711af
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/ansible/vars/deploy_vars.yml
View file

@ -22,8 +22,8 @@ drupal_settings:
- drupal_root: '{{ release_web_path }}' - drupal_root: '{{ release_web_path }}'
sites: sites:
- name: default - name: default
filename: settings.local.php
settings: settings:
base_url: http://d8.oliverdavies.uk
hash_salt: '{{ app_hash_salt }}' hash_salt: '{{ app_hash_salt }}'
databases: databases:
default: default:
@ -33,8 +33,6 @@ drupal_settings:
database: oliverdavies_uk database: oliverdavies_uk
username: '{{ app_mysql_user }}' username: '{{ app_mysql_user }}'
password: '{{ app_mysql_password }}' password: '{{ app_mysql_password }}'
config_directories:
sync: ../config/sync
trusted_hosts: trusted_hosts:
- '^d8\.oliverdavies\.uk$' - '^d8\.oliverdavies\.uk$'
extra_parameters: | extra_parameters: |

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

@ -761,3 +761,7 @@ $settings["config_sync_directory"] = '../config/default';
if (isset($_SERVER['SYMFONY_DEFAULT_ROUTE_URL']) && file_exists(__DIR__ . '/environments/settings.symfony.php')) { if (isset($_SERVER['SYMFONY_DEFAULT_ROUTE_URL']) && file_exists(__DIR__ . '/environments/settings.symfony.php')) {
require_once __DIR__ . '/environments/settings.symfony.php'; require_once __DIR__ . '/environments/settings.symfony.php';
} }
if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
include $app_root . '/' . $site_path . '/settings.local.php';
}