From 0550a759d28b924fbb25aa000681abc90a3e358f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 5 Dec 2019 08:41:01 +0100
Subject: [PATCH] Update temp path settings for Drupal 8.8+

---
 templates/d8_settings.php.jinja2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/d8_settings.php.jinja2 b/templates/d8_settings.php.jinja2
index fa13b54..9647d7f 100644
--- a/templates/d8_settings.php.jinja2
+++ b/templates/d8_settings.php.jinja2
@@ -35,6 +35,8 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
 $settings['install_profile'] = '{{ item.install_profile|default("standard") }}';
 $settings['file_public_path'] = 'sites/{{ item.shortname|default("default") }}/files';
 $settings['file_private_path'] = 'sites/{{ item.shortname|default("default") }}/private';
+$settings['file_temp_path'] = {% if drupal.jail is defined %}is_dir('{{ jailroot }}/{{ drupal.jail.name }}/tmp') ? '{{ jailroot }}/{{ drupal.jail.name }}/tmp' : '/tmp'{% else %}'/tmp'{% endif %};
+
 {% if reverse_proxy_ips|default(false) %}
 $settings['reverse_proxy'] = TRUE;
 $settings['reverse_proxy_addresses'] = array("{{ reverse_proxy_ips|join('","') }}","127.0.0.1");
@@ -52,6 +54,7 @@ $settings['trusted_host_patterns'] = array(
 {% endfor %}
 );
 
+// As soon as Drupal 8.8+ will be used everywhere, the following line can be removed.
 $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 %}
-- 
GitLab