Commit 87df1770 authored by Julien Muchembled's avatar Julien Muchembled

erp5/mariadb: move list of binary links to buildout.cfg

Same as commit 8da9aa07, to reduce redundancy.
parent b909270e
...@@ -171,7 +171,17 @@ context = ...@@ -171,7 +171,17 @@ context =
[template-mariadb] [template-mariadb]
< = download-base < = download-base
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 917f3e96819193ac183c7ee84e650eba md5sum = 8d9ad98bde1ed97012a0a8e52339c12c
link-binary =
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
${coreutils:location}/bin/cp
${coreutils:location}/bin/ls
${coreutils:location}/bin/tr
${coreutils:location}/bin/uname
${gettext:location}/bin/hostname
${grep:location}/bin/grep
${sed:location}/bin/sed
[template-kumofs] [template-kumofs]
< = download-base < = download-base
...@@ -203,8 +213,9 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0 ...@@ -203,8 +213,9 @@ md5sum = 564006953b7d7a12d40a14b6648b32f0
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in template = ${:_profile_base_location_}/instance.cfg.in
md5sum = d721cf9bb9a29736dbd37f131929ccab md5sum = fee9240473690a8a5c7add2f8d350338
extra-context = extra-context =
key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary key zope_link_binary template-zope:link-binary
key apache_location apache:location key apache_location apache:location
key aspell_location aspell:location key aspell_location aspell:location
...@@ -219,8 +230,6 @@ extra-context = ...@@ -219,8 +230,6 @@ extra-context =
key fontconfig_location fontconfig:location key fontconfig_location fontconfig:location
key fonts_location fonts:location key fonts_location fonts:location
key freetype_location freetype:location key freetype_location freetype:location
key gettext_location gettext:location
key grep_location grep:location
key gzip_location gzip:location key gzip_location gzip:location
key haproxy_location haproxy:location key haproxy_location haproxy:location
key jsl_location jsl:location key jsl_location jsl:location
...@@ -240,9 +249,6 @@ extra-context = ...@@ -240,9 +249,6 @@ extra-context =
key logrotate_location logrotate:location key logrotate_location logrotate:location
key mariadb_location mariadb:location key mariadb_location mariadb:location
key openssl_location openssl:location key openssl_location openssl:location
key perl_location perl:location
key perl_siteprefix perl:siteprefix
key sed_location sed:location
key sixtunnel_location 6tunnel:location key sixtunnel_location 6tunnel:location
key stunnel_location stunnel:location key stunnel_location stunnel:location
key template_balancer template-balancer:target key template_balancer template-balancer:target
......
...@@ -163,16 +163,7 @@ command = ${logrotate:wrapper} ...@@ -163,16 +163,7 @@ command = ${logrotate:wrapper}
[binary-link] [binary-link]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:bin} target-directory = ${directory:bin}
link-binary = link-binary = {{ dumps(parameter_dict['link-binary']) }}
{{ parameter_dict['coreutils-location'] }}/bin/basename
{{ parameter_dict['coreutils-location'] }}/bin/cat
{{ parameter_dict['coreutils-location'] }}/bin/cp
{{ parameter_dict['coreutils-location'] }}/bin/ls
{{ parameter_dict['coreutils-location'] }}/bin/tr
{{ parameter_dict['coreutils-location'] }}/bin/uname
{{ parameter_dict['gettext-location'] }}/lib/gettext/hostname
{{ parameter_dict['grep-location'] }}/bin/grep
{{ parameter_dict['sed-location'] }}/bin/sed
[binary-wrap-base] [binary-wrap-base]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
......
...@@ -170,16 +170,12 @@ extra-context = ...@@ -170,16 +170,12 @@ extra-context =
coreutils-location = {{ coreutils_location }} coreutils-location = {{ coreutils_location }}
dcron-location = {{ dcron_location }} dcron-location = {{ dcron_location }}
findutils-location = {{ findutils_location }} findutils-location = {{ findutils_location }}
gettext-location = {{ gettext_location }}
grep-location = {{ grep_location }}
gzip-location = {{ gzip_location }} gzip-location = {{ gzip_location }}
logrotate-location = {{ logrotate_location }} logrotate-location = {{ logrotate_location }}
mariadb-location = {{ mariadb_location }} mariadb-location = {{ mariadb_location }}
perl-location = {{ perl_location }}
perl-siteprefix = {{ perl_siteprefix }}
sed-location = {{ sed_location }}
template-my-cnf = {{ template_my_cnf }} template-my-cnf = {{ template_my_cnf }}
template-mariadb-initial-setup = {{ template_mariadb_initial_setup }} template-mariadb-initial-setup = {{ template_mariadb_initial_setup }}
link-binary = {{ dumps(mariadb_link_binary) }}
[dynamic-template-mariadb] [dynamic-template-mariadb]
< = jinja2-template-base < = jinja2-template-base
......
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