repman: fix request slave instance parameters

0502172c · Alain Takoudjou · 3a1b4743 · 0502172c · 0502172c
Commit 0502172c authored May 28, 2020 by Alain Takoudjou
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

software/repman/buildout.hash.cfg software/repman/buildout.hash.cfg +1 -1

software/repman/instance-repman.cfg.jinja2.in software/repman/instance-repman.cfg.jinja2.in +4 -2

No files found.
--- a/software/repman/buildout.hash.cfg
+++ b/software/repman/buildout.hash.cfg
@@ -18,7 +18,7 @@ md5sum = da50540b1c0fc69ffbf8f6e345a3baad
 [instance-repman.cfg]
 _update_hash_filename_ = instance-repman.cfg.jinja2.in
-md5sum = 3d8199bbae01915267a441f47f25ef0d
+md5sum = 482c9f2cad5a35fd0e556dd353a0d39c
 [config-toml.in]
 _update_hash_filename_ = templates/config.toml.in

--- a/software/repman/instance-repman.cfg.jinja2.in
+++ b/software/repman/instance-repman.cfg.jinja2.in
@@ -457,8 +457,10 @@ password = ${publish-early:monitor-password}
 recipe = slapos.cookbook:requestoptional
 name = Replication Manager Frontend
 # XXX We have hardcoded SR URL here.
-software-url = {{ frontend_parameter_dict.get('frontend-software-url', '') }}
+software-url = {{ frontend_parameter_dict.get('frontend-software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') }}
-software-type ={{ frontend_parameter_dict.get('frontend-software-type', '') }}
+{% if frontend_parameter_dict.get('frontend-software-type', '') -%}
+software-type ={{ frontend_parameter_dict['frontend-software-type'] }}
+{% endif -%}
 slave = true
 config-url = ${nginx-parameter:backend-ssl-url}
 config-domain = {{ frontend_parameter_dict.get('slave-domain', '') }}