Merge pull request #145 from plone/fulv-issue-135

Fixes issue plone/ansible-playbook#135
plone · May 8, 2020 · d79533f · d79533f
2 parents 4fd9ff0 + 7093e01
commit d79533f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -2,6 +2,8 @@
 
 - When copying buildout extra directory, preserve file modes.
   [smcmahon]
+- Fix incorrect indentation with plone_zope_conf_additional
+  [fulv]
 
 1.3.8 2020-02-15
 

diff --git a/templates/buildout.cfg.j2 b/templates/buildout.cfg.j2
@@ -231,7 +231,7 @@ http-address = 127.0.0.1:{{ instance_config.plone_client_base_port }}
 {% if instance_config.plone_zope_conf_additional or instance_config.plone_client_tcpcheck %}
 zope-conf-additional =
 {% if instance_config.plone_zope_conf_additional %}
-    {{ instance_config.plone_zope_conf_additional }}
+    {{ instance_config.plone_zope_conf_additional | indent(4) }}
 {% endif %}
 {% if instance_config.plone_client_tcpcheck %}
     <product-config five.z2monitor>
@@ -248,7 +248,7 @@ http-address = 127.0.0.1:{{ "%s" % (instance_config.plone_client_base_port|int +
 {% if instance_config.plone_zope_conf_additional or instance_config.plone_client_tcpcheck %}
 zope-conf-additional =
 {% if instance_config.plone_zope_conf_additional %}
-    {{ instance_config.plone_zope_conf_additional }}
+    {{ instance_config.plone_zope_conf_additional | indent(4)  }}
 {% endif %}
 {% if instance_config.plone_client_tcpcheck %}
     <product-config five.z2monitor>