Skip to content
Snippets Groups Projects
Commit 308cca14 authored by jurgenhaas's avatar jurgenhaas
Browse files

ansible-inventories/arocom#1216 Allow config directory names being different from their key

parent 70904658
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@ drupal_install_drupal: true
drupal_contrib_subdir: ''
drupal_links_relative_root: '../../..'
drupal_config_directories:
- 'sync'
sync: 'sync'
drupal_d6_create_symbolic_links: true
drupal_post_deploy_tasks:
d6:
......
......@@ -34,7 +34,7 @@
- name: "Ensure config directories"
file:
path: '{{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/files/{{ item.0.config|default("config") }}/{{ item.1 }}'
path: '{{ drupalRoot }}/sites/{{ item.0.shortname|default("default") }}/files/{{ item.0.config|default("config") }}/{{ drupal_config_directories[item.1] }}'
state: 'directory'
owner: '{{ apacheUser }}'
group: '{{ apacheUser }}'
......
......@@ -137,7 +137,7 @@
- name: "Create the settings.php files"
template:
src='{{ drupal.template_dir|default('') }}{{ drupal.version|default("d7") }}_settings.php'
src='{{ drupal.template_dir|default('') }}{{ drupal.version|default("d7") }}_settings.php.jinja2'
dest='{{ webRoot }}/settings/{{ item.shortname|default("default") }}/settings.php'
with_items: '{{ drupal.domains }}'
tags: 'deploy'
......
......@@ -37,4 +37,4 @@
tags: 'deploy'
when: limit_site is not defined or drupal.id is not defined or limit_site == drupal.id
when: '"drupal" not in excluded_roles and drupal_install_drupal and collect_config and collect_config'
when: '"drupal" not in excluded_roles and drupal_install_drupal and collect_config is defined and collect_config'
File moved
File moved
......@@ -54,8 +54,8 @@ $settings['trusted_host_patterns'] = array(
$config['system.file']['path']['temporary'] = '{% if drupal.jail is defined %}{{ jailroot }}/{{ drupal.jail.name }}{% endif %}/tmp';
{% for directory in drupal_config_directories %}
$config_directories['{{ directory }}'] = 'sites/{{ item.shortname|default("default") }}/files/{{ item.config|default("config") }}/{{ directory }}';
{% for key in drupal_config_directories %}
$config_directories['{{ key }}'] = 'sites/{{ item.shortname|default("default") }}/files/{{ item.config|default("config") }}/{{ drupal_config_directories[key] }}';
{% endfor %}
{% for line in item.extra_settings|default([]) %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment