From b61bc932f26421d629bf4ed38c43b8d388b7f1de Mon Sep 17 00:00:00 2001
From: "Adrien \"ze\" Urban" <aur@nbs-system.com>
Date: Mon, 19 Aug 2019 12:57:44 +0000
Subject: [PATCH] apache2/ini: fix config merge

fix merge like other ini files
---
 php/ng/apache2/ini.sls | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/php/ng/apache2/ini.sls b/php/ng/apache2/ini.sls
index 6e9bc398..3fd14beb 100644
--- a/php/ng/apache2/ini.sls
+++ b/php/ng/apache2/ini.sls
@@ -3,7 +3,13 @@
 {% from "php/ng/ini.jinja" import php_ini %}
 
 {% set settings = php.ini.defaults %}
-{% do settings.update(php.apache2.ini.settings) %}
+{% for key, value in php.apache2.ini.settings.items() %}
+  {% if settings[key] is defined %}
+    {% do settings[key].update(value) %}
+  {% else %}
+    {% do settings.update({key: value}) %}
+  {% endif %}
+{% endfor %}
 
 include:
   - php.ng.deprecated