Commit 293989d2 authored by Levin Zimmermann's avatar Levin Zimmermann

stack/erp5/WCFS+NEO: Fix URI by dropping SlapOS convenience hack parameters

NEO/go doesn't understand what it should do with these parameters and
raises an error in case they are added to the NEO URI [1].

[1] https://lab.nexedi.com/kirr/neo/-/blob/f1a1bb9d/go/neo/client.go#L551-553
parent 7e3bdc1e
...@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8 ...@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in] [instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in filename = instance-wcfs.cfg.in
md5sum = 74a96e35ea3615243a306d375004d111 md5sum = 207df763504b503bf8ee6941914582ad
...@@ -23,7 +23,12 @@ ...@@ -23,7 +23,12 @@
{% set argv = [] -%} {% set argv = [] -%}
{% set i = 0 -%} {% set i = 0 -%}
{% for k,v in z|dictsort -%} {% for k,v in z|dictsort -%}
{% do argv.append('%s=%s' % (k,v)) -%} {# Parameters which neither set client nor server: -#}
{# they can be ignored as they are merely resulting from a convenience hack. -#}
{# (see https://lab.nexedi.com/nexedi/slapos/commit/706801f2) -#}
{% if k not in ["_ca", "_key", "_cert"] %}
{% do argv.append('%s=%s' % (k,v)) -%}
{% endif %}
{% endfor -%} {% endfor -%}
{% if len(argv) > 0 -%} {% if len(argv) > 0 -%}
{% set zurl = zurl + '&' + '?'.join(argv) -%} {% set zurl = zurl + '&' + '?'.join(argv) -%}
......
...@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8 ...@@ -102,4 +102,4 @@ md5sum = 5cf0316fdd17a940031e4083bbededd8
[instance-wcfs.cfg.in] [instance-wcfs.cfg.in]
filename = instance-wcfs.cfg.in filename = instance-wcfs.cfg.in
md5sum = 74a96e35ea3615243a306d375004d111 md5sum = 207df763504b503bf8ee6941914582ad
...@@ -23,7 +23,12 @@ ...@@ -23,7 +23,12 @@
{% set argv = [] -%} {% set argv = [] -%}
{% set i = 0 -%} {% set i = 0 -%}
{% for k,v in z|dictsort -%} {% for k,v in z|dictsort -%}
{% do argv.append('%s=%s' % (k,v)) -%} {# Parameters which neither set client nor server: -#}
{# they can be ignored as they are merely resulting from a convenience hack. -#}
{# (see https://lab.nexedi.com/nexedi/slapos/commit/706801f2) -#}
{% if k not in ["_ca", "_key", "_cert"] %}
{% do argv.append('%s=%s' % (k,v)) -%}
{% endif %}
{% endfor -%} {% endfor -%}
{% if len(argv) > 0 -%} {% if len(argv) > 0 -%}
{% set zurl = zurl + '&' + '?'.join(argv) -%} {% set zurl = zurl + '&' + '?'.join(argv) -%}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment