ansible-playbooks/general#85 Bug fix

templates/d6_settings.php.jinja2

@@ -24,7 +24,7 @@ $conf['clean_url'] = 1;
 
 $conf['file_directory_path'] = 'sites/{{ item.shortname|default("default") }}/files';
 $conf['file_directory_private'] = 'sites/{{ item.shortname|default("default") }}/private';
-$conf['file_directory_temp'] = {% if drupal.jail is defined %}function_exists('drush_is_command') ? '/tmp' : {{ jailroot }}/{{ drupal.jail.name }}/tmp'{% else %}'/tmp{% endif %};
+$conf['file_directory_temp'] = {% if drupal.jail is defined %}function_exists('drush_is_command') ? '/tmp' : '{{ jailroot }}/{{ drupal.jail.name }}/tmp'{% else %}'/tmp'{% endif %};
 
 $conf['syslog_identity'] = 'drupal_{{ item.domain }}';
 

templates/d7_settings.php.jinja2

@@ -42,7 +42,7 @@ ini_set('session.cookie_lifetime', 2000000);
 $conf['{{ item.protocol|default("https") }}'] = TRUE;
 $conf['file_public_path'] = 'sites/{{ item.shortname|default("default") }}/files';
 $conf['file_private_path'] = 'sites/{{ item.shortname|default("default") }}/private';
-$conf['file_temporary_path'] = {% if drupal.jail is defined %}is_dir('{{ jailroot }}/{{ drupal.jail.name }}/tmp') ? '{{ jailroot }}/{{ drupal.jail.name }}/tmp' : /tmp'{% else %}'/tmp{% endif %};
+$conf['file_temporary_path'] = {% if drupal.jail is defined %}is_dir('{{ jailroot }}/{{ drupal.jail.name }}/tmp') ? '{{ jailroot }}/{{ drupal.jail.name }}/tmp' : '/tmp'{% else %}'/tmp'{% endif %};
 
 $conf['syslog_identity'] = 'drupal_{{ item.domain }}';
 

templates/d8_settings.php.jinja2

@@ -58,7 +58,7 @@ $settings['trusted_host_patterns'] = array(
 {% endfor %}
 );
 
-$config['system.file']['path']['temporary'] = {% if drupal.jail is defined %}is_dir('{{ jailroot }}/{{ drupal.jail.name }}/tmp') ? '{{ jailroot }}/{{ drupal.jail.name }}/tmp' : /tmp'{% else %}'/tmp{% endif %};
+$config['system.file']['path']['temporary'] = {% if drupal.jail is defined %}is_dir('{{ jailroot }}/{{ drupal.jail.name }}/tmp') ? '{{ jailroot }}/{{ drupal.jail.name }}/tmp' : '/tmp'{% else %}'/tmp'{% endif %};
 
 {% for key in drupal_config_directories %}
 $config_directories['{{ key }}'] = 'sites/{{ item.shortname|default("default") }}/files/{{ item.config|default("config") }}/{{ drupal_config_directories[key] }}';