Commit 2d969c07 authored by Titouan Soulard's avatar Titouan Soulard

slapos-master: delete custom instance-erp5.cfg.in

Historically, a custom `instance-erp5.cfg.in` was required for SlapOS Master in order to install
the SlapOS configurator. This required changing the default business templates, which can, since
49a7f256, be done using a custom build section.

This commit updates the `software.cfg` file accordingly, and deletes the legacy
`instance-erp5.cfg.in` file, which is not needed anymore, to instead use the file provided in
`stack/erp5`.

/cc @rafael
parent de5e381d
Pipeline #33422 failed with stage
in 0 seconds
......@@ -12,10 +12,6 @@
# Substitution (${...:...}), extension ([buildout] extends = ...) and
# section inheritance (< = ...) are NOT supported (but you should really
# not need these here).
[template-erp5]
filename = instance-erp5.cfg.in
md5sum = 620912069597ea748d55cb68790fa270
[template-balancer]
filename = instance-balancer.cfg.in
md5sum = 88e15a803df4aa35285e59ae9186438a
......
This diff is collapsed.
......@@ -17,6 +17,11 @@ repository_id_list += vifib/master
[erp5]
branch = erp5-vifib
[default-bt5]
list =
erp5_full_text_mroonga_catalog
slapos_configurator
[vifib]
<= erp5
repository = https://lab.nexedi.com/nexedi/slapos.core.git
......@@ -45,10 +50,6 @@ extra-paths +=
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/${:filename}
[template-erp5]
< = download-base-part
filename = instance-erp5.cfg.in
[template-balancer]
< = download-base-part
filename = instance-balancer.cfg.in
......
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