From 26ad8e735b6da197fbf21a72725174eeef1d6b04 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 2 May 2019 19:49:39 +0100 Subject: [PATCH] Make filename configurable --- molecule/default/playbook.yml | 1 + molecule/default/tests/test_default.py | 2 +- tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml index 9bf8514..afffe11 100644 --- a/molecule/default/playbook.yml +++ b/molecule/default/playbook.yml @@ -6,5 +6,6 @@ - root: /var/www/test sites: - name: default + filename: settings.test.php roles: - role: opdavies.drupal-settings diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 9f53467..3bf2b01 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -12,7 +12,7 @@ def test_drupal_site_directory_exists(host): assert directory.is_directory def test_drupal_settings_file_exists(host): - file = host.file('/var/www/test/sites/default/settings.php') + file = host.file('/var/www/test/sites/default/settings.test.php') assert file.exists assert file.is_file diff --git a/tasks/main.yml b/tasks/main.yml index f855a20..fbc23b4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -10,7 +10,7 @@ - name: Ensure that Drupal settings files are present template: src: settings.php.j2 - dest: '{{ item.0.root }}/sites/{{ item.1.name|default("default") }}/settings.php + dest: '{{ item.0.root }}/sites/{{ item.1.name|default("default") }}/{{ item.1.filename|default("settings.php") }}' with_subelements: - '{{ drupal_settings }}' - sites