Fix indentation/spacing of some inline options

software/neoppod/stress-testing/software.cfg

@@ -11,7 +11,8 @@ parts =
 [template]
 recipe = slapos.recipe.template:jinja2
 output = ${buildout:directory}/template.cfg
-inline =[buildout]
+inline =
+  [buildout]
   eggs-directory = ${buildout:eggs-directory}
   develop-eggs-directory = ${buildout:develop-eggs-directory}
   parts = runTestSuite

software/slapos-master/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = ce9c231ec47eb8f528345add21cb7822
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 95ac13b95bc9d5356fffe9c62dec38cc
+md5sum = da8399562377b472c9488a337d0230dc
 
 [template-apache-backend-conf]
 filename = apache-backend.conf.in

software/slapos-master/instance-balancer.cfg.in

@@ -125,7 +125,7 @@ crl = ${directory:apache-conf}/crl.pem
 
 [simplefile]
 < = jinja2-template-base
-inline ={{ '{{ content }}' }}
+inline = {{ '{{ content }}' }}
 
 {% macro simplefile(section_name, file_path, content, mode='') -%}
 {%   set content_section_name = section_name ~ '-content' -%}

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = c9cd1d4c61733fb56078a99de9062800
+md5sum = 7ea72f2300dd2019c2d27549e7128dec
 
 [instance]
 _update_hash_filename_ = instance.cfg.in
@@ -23,11 +23,11 @@ md5sum = af4d92a95dc25c2f64ddbd634996e46c
 
 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in
-md5sum = 6e5092422c97c21f02f7b7b3ff015367
+md5sum = 29bc1c5b76d20fd46430dff5c72d192b
 
 [instance-export]
 _update_hash_filename_ = instance-export.cfg.jinja.in
-md5sum = 31a94c7a5ef18dbad807c0b57dfe6e0c
+md5sum = e2630148998c3cdf6d03b5e884d7f464
 
 [instance-resilient]
 _update_hash_filename_ = instance-resilient.cfg.jinja

software/theia/instance-export.cfg.jinja.in

@@ -75,7 +75,7 @@ config-command = $${export-promise-script:output}
 [initial-export-exitcode-file]
 recipe = slapos.recipe.template:jinja2
 output = $${theia-export-script:exitcode-file}
-inline =0
+inline = 0
 once = $${:output}
 
 [export-promise-script]

software/theia/instance-import.cfg.jinja.in

@@ -137,7 +137,7 @@ config-command = $${import-promise-script:output}
 [initial-import-exitcode-file]
 recipe = slapos.recipe.template:jinja2
 output = $${theia-import-script:exitcode-file}
-inline =0
+inline = 0
 once = $${:output}
 
 [import-promise-script]

software/theia/instance-theia.cfg.jinja.in

@@ -402,7 +402,9 @@ base-url = $${theia-service:base-url}
 [theia-shell]
 recipe = slapos.recipe.template:jinja2
 output = $${directory:bin}/$${:_buildout_section_name_}
-inline ={% raw %}#!{{ bash }}
+inline
+  {% raw -%}
+  #!{{ bash }}
   SHELL=$BASH
   # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
   if [ $# = 0 ]; then
@@ -462,7 +464,7 @@ inline =
 [embedded-instance-parameters]
 recipe = slapos.recipe.template
 output = $${directory:project}/$${:_buildout_section_name_}.json
-inline ={{ embedded_instance_parameters | indent(2) }}
+inline = {{ embedded_instance_parameters | indent(2) }}
 {%-   endif %}
 {%- endif %}
 

software/theia/test/resilience_dummy/instance.cfg.in

@@ -26,7 +26,7 @@ output = $${directory:run}/log-writer
 
 [exporter.exclude]
 recipe = slapos.recipe.template
-inline =$${directory:home}/exclude
+inline = $${directory:home}/exclude
 output = $${directory:srv}/exporter.exclude
 
 [runner-import-restore]

software/turnserver/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = f47adc5131a3096e916dbf9ef0061f50
 
 [template-turnserver]
 filename = instance-turnserver.cfg.jinja2.in
-md5sum = b71bcc86f217cd737fc890667adb7c69
+md5sum = f7ae944a28366c8888946af440d513ed
 
 [template-insecure-turnserver]
 filename = instance-insecure-turnserver.cfg.jinja2.in

software/turnserver/instance-turnserver.cfg.jinja2.in

@@ -17,7 +17,7 @@ ssl = ${:etc}/ssl
 
 [file-base]
 recipe = slapos.recipe.template:jinja2
-inline ={{ '{{ content }}' }}
+inline = {{ '{{ content }}' }}
 
 
 {% macro simplefile(section_name, file_path, content, mode='') -%}

software/wendelin-scalability/test-fluentd-common.cfg

@@ -43,7 +43,8 @@ extra =
   [fluentd-agent-conf]
   recipe = slapos.recipe.template:jinja2
   output = $${directory:etc}/fluentd-agent.conf
-  inline ={% raw -%}
+  inline =
+    {% raw -%}
     <match debug.**>
       @type stdout
       @id stdout_output

stack/erp5/buildout.hash.cfg

@@ -50,7 +50,7 @@ md5sum = f928b9dc99f7f970caadfe7dd6f95d34
 
 [template-postfix]
 filename = instance-postfix.cfg.in
-md5sum = 5c84bbd3e60d86d153c75994679184a8
+md5sum = 0b7db23344b4795c8786d5e655810b38
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.in
@@ -86,11 +86,11 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = b6a07f2fab6ff9f54a7d8e7ff9e2b846
+md5sum = c3e3f8cd985407931b705d15bdedc8d9
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = afd6140a8e8dcd3f95846b546acbeba7
+md5sum = 4491b256241cb4bbdfafb22ae95a3eba
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -230,7 +230,7 @@ caucase-key = ${directory:apache-conf}/apache-caucase.pem
 
 [simplefile]
 < = jinja2-template-base
-inline ={{ '{{ content }}' }}
+inline = {{ '{{ content }}' }}
 
 {% macro simplefile(section_name, file_path, content, mode='') -%}
 {%   set content_section_name = section_name ~ '-content' -%}

stack/erp5/instance-postfix.cfg.in

@@ -100,7 +100,7 @@ recipe = slapos.cookbook:userinfo
 < = jinja2-template-base
 output = ${directory:etc-postfix}/sasl_passwd
 {% if relay -%}
-inline ={{ "{{ host }} {{ sasl_credential }}" }}
+inline = {{ "{{ host }} {{ sasl_credential }}" }}
 {%- else -%}
 inline =
 {%- endif %}

stack/erp5/instance-zope.cfg.in

@@ -210,7 +210,7 @@ command-line = '${userhosts-bin:output}' ${:wrapped-command-line}
 [{{ section('neo-ssl-' + k[1:]) }}]
 < = jinja2-template-base
 output = ${directory:etc}/{{v}}
-inline ={{'{{'}}pem}}
+inline = {{'{{'}}pem}}
 context = key pem :pem
 pem = {{dumps(storage_dict.pop(k))}}
 
@@ -241,7 +241,7 @@ file-list = {{ parameter_dict['site-zcml'] }}
 [{{ section('zope-inituser') }}]
 < = jinja2-template-base
 output = ${directory:instance}/inituser
-inline ={{ slapparameter_dict['inituser-login'] }}:{SHA}{{ base64.b64encode(hashlib.sha1(slapparameter_dict['inituser-password'].encode('utf-8')).digest()) }}
+inline = {{ slapparameter_dict['inituser-login'] }}:{SHA}{{ base64.b64encode(hashlib.sha1(slapparameter_dict['inituser-password'].encode('utf-8')).digest()) }}
 once = ${:output}_done
 
 [zope-conf-parameter-base]

stack/supervisord/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [supervisord-library]
 _update_hash_filename_ = supervisord.jinja2.in
-md5sum = 5d4ef34e10d19fd726a75c9ee9a82b10
+md5sum = 69b73a768ae017072d252e6e71109204
 
 [supervisord-conf]
 _update_hash_filename_ = supervisord.conf.in

stack/supervisord/supervisord.jinja2.in

@@ -53,7 +53,8 @@ wrapper-path = ${directory:bin}/{{ name }}
 
 [supervisord-{{ name }}]
 recipe = slapos.recipe.template
-inline =[program:{{ parameter_dict['name'] }}]
+inline =
+  [program:{{ parameter_dict['name'] }}]
   directory = ${buildout:directory}
   command = {{ parameter_dict['command'] }}
   process_name = {{ parameter_dict['name'] }}