Commit b9a6392d authored by Rafael Monnerat's avatar Rafael Monnerat

erp5: Allow other software release provide custom default bt5 to install

See merge request nexedi/slapos!1534
parents aed29e59 49a7f256
Pipeline #32953 failed with stage
in 0 seconds
...@@ -188,6 +188,7 @@ context = ...@@ -188,6 +188,7 @@ context =
key with_max_rlimit_nofile_enable_default erp5-defaults:with-max-rlimit-nofile-enable-default key with_max_rlimit_nofile_enable_default erp5-defaults:with-max-rlimit-nofile-enable-default
key kumo_location kumo:location key kumo_location kumo:location
key local_bt5_repository local-bt5-repository:list key local_bt5_repository local-bt5-repository:list
key default_bt5 default-bt5:list
key logrotate_location logrotate:location key logrotate_location logrotate:location
key mariadb_location mariadb:location key mariadb_location mariadb:location
key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target key mariadb_resiliency_after_import_script mariadb-resiliency-after-import-script:target
...@@ -304,6 +305,13 @@ branch = master ...@@ -304,6 +305,13 @@ branch = master
repository = https://lab.nexedi.com/nexedi/erp5-doc.git repository = https://lab.nexedi.com/nexedi/erp5-doc.git
branch = master branch = master
[default-bt5]
list =
erp5_full_text_mroonga_catalog
erp5_configurator_standard
erp5_configurator_maxma_demo
erp5_configurator_run_my_doc
[bt5-repository] [bt5-repository]
# Format: # Format:
# <url or path> [...] # <url or path> [...]
......
...@@ -70,11 +70,11 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04 ...@@ -70,11 +70,11 @@ md5sum = b95084ae9eed95a68eada45e28ef0c04
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 55463b0abdbe0118ef1c27e6b71c3324 md5sum = ca0cb83950dd9079cc289891cce08e76
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = ae9c380ae04dde4f20e139c66ef7c22a md5sum = 07012cab8738836bb315f61bcc09c0c3
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
......
...@@ -224,12 +224,7 @@ return = ...@@ -224,12 +224,7 @@ return =
{%- if test_runner_enabled %} {%- if test_runner_enabled %}
test-runner-address-list test-runner-address-list
{% endif %} {% endif %}
{% set bt5_default_list = [ {% set bt5_default_list = default_bt5.split() -%}
'erp5_full_text_mroonga_catalog',
'erp5_configurator_standard',
'erp5_configurator_maxma_demo',
'erp5_configurator_run_my_doc',
] -%}
{% if has_jupyter -%} {% if has_jupyter -%}
{% do bt5_default_list.append('erp5_data_notebook') -%} {% do bt5_default_list.append('erp5_data_notebook') -%}
{% endif -%} {% endif -%}
......
...@@ -45,6 +45,7 @@ jupyter-enable-default = {{ jupyter_enable_default }} ...@@ -45,6 +45,7 @@ jupyter-enable-default = {{ jupyter_enable_default }}
wcfs-enable-default = {{ wcfs_enable_default }} wcfs-enable-default = {{ wcfs_enable_default }}
with-max-rlimit-nofile-enable-default = {{ with_max_rlimit_nofile_enable_default }} with-max-rlimit-nofile-enable-default = {{ with_max_rlimit_nofile_enable_default }}
local-bt5-repository = {{ ' '.join(local_bt5_repository.split()) }} local-bt5-repository = {{ ' '.join(local_bt5_repository.split()) }}
default-bt5 = {{ ' '.join(default_bt5.split()) }}
[context] [context]
root-common = {{ root_common }} root-common = {{ root_common }}
...@@ -61,6 +62,7 @@ extra-context = ...@@ -61,6 +62,7 @@ extra-context =
key wcfs_enable_default dynamic-template-erp5-parameters:wcfs-enable-default key wcfs_enable_default dynamic-template-erp5-parameters:wcfs-enable-default
key with_max_rlimit_nofile_enable_default dynamic-template-erp5-parameters:with-max-rlimit-nofile-enable-default key with_max_rlimit_nofile_enable_default dynamic-template-erp5-parameters:with-max-rlimit-nofile-enable-default
key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository key local_bt5_repository dynamic-template-erp5-parameters:local-bt5-repository
key default_bt5 dynamic-template-erp5-parameters:default-bt5
key openssl_location :openssl-location key openssl_location :openssl-location
import re re import re re
import urllib_parse six.moves.urllib.parse import urllib_parse six.moves.urllib.parse
......
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