Commit 09f8b080 authored by Jérome Perrin's avatar Jérome Perrin

erp5: publish cloudooo URL as http:// not cloudooo://

Because this url is use by [erp5_promise](https://lab.nexedi.com/nexedi/erp5/blob/450ae11128503934b4d81de8c7c72ba7aa7948d5/bt5/erp5_promise/SkinTemplateItem/portal_skins/erp5_promise/Alarm_checkPromiseConversionServer.py#L5) to configure cloudooo in the preference, but erp5 preference is not supposed to be `cloudooo://` but just `http://` . 

FYI, this erp5_promise is the **Check Site Consistency** part described in the "ERP5 on webrunner" installation procedure as documented in https://www.erp5.com/erp5-HowTo.Request.Erp5.Instance.On.Slap.Os.Webrunner

/cc @tc @vpelletier 

/reviewed-on !94
parent 0444f0b8
......@@ -41,7 +41,7 @@
},
"cloudooo-url": {
"description": "Conversion service access information - DEPRECATED",
"pattern": "^cloudooo://",
"pattern": "^(http|https)://",
"type": "string"
},
"mariadb-database-list": {
......
......@@ -177,7 +177,7 @@ md5sum = 763db0c4a94649296e74fe1f53c03940
[template-cloudooo]
<= download-base
filename = instance-cloudoo.cfg.in
md5sum = 1eedc7ee93ac7c95e1c7d50a36ef2b01
md5sum = 5691b7f12d22bfb8a926dfcb592f12c8
[template-zope-conf]
<= download-base
......
......@@ -14,9 +14,9 @@ parts +=
[publish]
recipe = slapos.cookbook:publish.serialised
{% if use_ipv6 -%}
url = cloudooo://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
url = http://[${ipv6toipv4:ipv6}]:${ipv6toipv4:ipv6-port}/
{% else -%}
url = cloudooo://${cloudooo-instance:ip}:${cloudooo-instance:port}/
url = http://${cloudooo-instance:ip}:${cloudooo-instance:port}/
{% endif -%}
[cloudooo-instance]
......
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