stack/slapos.cfg: v↑ 5.1 slapos.recipe.template

software/fluentd/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance-profile]
 filename = instance.cfg
-md5sum = 41f5acc071609a0c4b5ada295ede6bac
+md5sum = 82c476f22e6b55b674640abef959c3c2
 
 [template-fluentd]
 filename = instance-fluentd.cfg

software/fluentd/instance.cfg

@@ -42,7 +42,7 @@ recipe = slapos.recipe.build
 slapparameter-dict = $${slap-configuration:configuration}
 init =
   import re
-  options['text'] = options['slapparameter-dict'].get('conf_text') or ''
+  options['text'] = options['slapparameter-dict'].get('conf_text') or ' '
   options['port-list'] = re.findall(r'<source>.*port (\d+).*<\/source>', options['text'], re.DOTALL)
 
 [fluentd-agent-conf]

software/repman/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = 0eeb24c6aa0760f0d33c4cc2828ddf30
 
 [template-mariadb.cfg]
 _update_hash_filename_ = instance-mariadb.cfg.jinja2.in
-md5sum = bd5b0e72e8b5ddcd691e7f90a2947e50
+md5sum = d1efa1148ef1d4fb3f2869f08ce85fd2
 
 [template-my-cnf]
 _update_hash_filename_ = templates/my.cnf.in

software/repman/instance-mariadb.cfg.jinja2.in

@@ -209,7 +209,7 @@ wait-for-files =
 [{{ section('odbc-ini') }}]
 recipe = slapos.recipe.template
 output = ${directory:etc}/odbc.ini
-inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
+inline = {{ dumps(slapparameter_dict.get('odbc-ini', ' ')) }}
 
 [{{ section('logrotate-entry-mariadb') }}]
 < = logrotate-entry-base

stack/erp5/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = cee995829fbd138a8c2c9209d72d01a0
+md5sum = 93b2277185e4949a3d17be79d3710d2d
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in

stack/erp5/instance-mariadb.cfg.in

@@ -193,7 +193,7 @@ environ =
 [{{ section('odbc-ini') }}]
 recipe = slapos.recipe.template
 output = ${directory:etc}/odbc.ini
-inline = {{ dumps(slapparameter_dict.get('odbc-ini', '')) }}
+inline = {{ dumps(slapparameter_dict.get('odbc-ini', ' ')) }}
 
 [{{ section('logrotate-entry-mariadb') }}]
 < = logrotate-entry-base

stack/slapos.cfg

@@ -297,7 +297,7 @@ slapos.libnetworkcache = 0.25
 slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.56
 slapos.recipe.cmmi = 0.19
-slapos.recipe.template = 5.0
+slapos.recipe.template = 5.1
 slapos.toolbox = 0.129
 smmap = 5.0.0
 sniffio = 1.3.0