Commit 49592f0c authored by Tatuya Kamada's avatar Tatuya Kamada

erp5: Parameterise mariadb data directory

parent 5bb74740
...@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e ...@@ -26,7 +26,7 @@ md5sum = d95e8500bdc72d1f40b97cc414656e7e
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 591fe60e2f615c7690fa5078473b1b0a md5sum = fa6081255666cdd7fd971d3dc3919c29
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
......
...@@ -126,7 +126,8 @@ command = {{ parameter_dict['findutils-location'] }}/bin/find "${directory:maria ...@@ -126,7 +126,8 @@ command = {{ parameter_dict['findutils-location'] }}/bin/find "${directory:maria
ip = {{ ip }} ip = {{ ip }}
port = {{ port }} port = {{ port }}
socket = ${directory:run}/mariadb.sock socket = ${directory:run}/mariadb.sock
data-directory = ${directory:srv}/mariadb {% set data_directory = slapparameter_dict.get('data-directory', '${directory:mariadb-data}') -%}
data-directory = {{ data_directory }}
tmp-directory = ${directory:tmp} tmp-directory = ${directory:tmp}
etc-directory = ${directory:etc} etc-directory = ${directory:etc}
pid-file = ${directory:run}/mariadb.pid pid-file = ${directory:run}/mariadb.pid
......
  • There's no ${directory:mariadb-data} anymore. And the 2 lines can be merged:

    data-directory = {{slapparameter_dict.get('data-directory', '${directory:srv}/mariadb')}}
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