Commit 6cbc01df authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Set mariadb tmpdir option.

parent 7e5ba508
...@@ -156,7 +156,7 @@ mode = 755 ...@@ -156,7 +156,7 @@ mode = 755
[template-mariadb] [template-mariadb]
<= download-base <= download-base
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = ede2481d6ce60a335bde920d8cec5318 md5sum = 9312af2f9d9faf06d2f26f073ad60180
link-binary = link-binary =
${coreutils:location}/bin/basename ${coreutils:location}/bin/basename
${coreutils:location}/bin/cat ${coreutils:location}/bin/cat
...@@ -192,7 +192,7 @@ md5sum = bc6048b85b410693e60e5a77399dd1b7 ...@@ -192,7 +192,7 @@ md5sum = bc6048b85b410693e60e5a77399dd1b7
[template-my-cnf] [template-my-cnf]
<= download-base <= download-base
filename = my.cnf.in filename = my.cnf.in
md5sum = ac5c87991d95907f62bf2129ecfd42c4 md5sum = d50920c942b8ee98402f8551fef38383
[template-mariadb-initial-setup] [template-mariadb-initial-setup]
<= download-base <= download-base
......
...@@ -102,6 +102,7 @@ ip = {{ ip }} ...@@ -102,6 +102,7 @@ ip = {{ ip }}
port = {{ port }} port = {{ port }}
socket = ${directory:run}/mariadb.sock socket = ${directory:run}/mariadb.sock
data-directory = ${directory:mariadb-data} data-directory = ${directory:mariadb-data}
tmp-directory = ${directory:tmp}
pid-file = ${directory:run}/mariadb.pid pid-file = ${directory:run}/mariadb.pid
error-log = ${directory:log}/mariadb_error.log error-log = ${directory:log}/mariadb_error.log
slow-query-log = ${directory:log}/mariadb_slowquery.log slow-query-log = ${directory:log}/mariadb_slowquery.log
...@@ -204,6 +205,7 @@ etc = ${buildout:directory}/etc ...@@ -204,6 +205,7 @@ etc = ${buildout:directory}/etc
services = ${:etc}/run services = ${:etc}/run
promise = ${:etc}/promise promise = ${:etc}/promise
srv = ${buildout:directory}/srv srv = ${buildout:directory}/srv
tmp = ${buildout:directory}/tmp
backup = ${:srv}/backup backup = ${:srv}/backup
mariadb-backup-full = ${:backup}/mariadb-full mariadb-backup-full = ${:backup}/mariadb-full
mariadb-backup-incremental = ${:backup}/mariadb-incremental mariadb-backup-incremental = ${:backup}/mariadb-incremental
......
...@@ -19,6 +19,7 @@ skip_networking ...@@ -19,6 +19,7 @@ skip_networking
{% endif -%} {% endif -%}
socket = {{ socket }} socket = {{ socket }}
datadir = {{ parameter_dict['data-directory'] }} datadir = {{ parameter_dict['data-directory'] }}
tmpdir = {{ parameter_dict['tmp-directory'] }}
pid_file = {{ parameter_dict['pid-file'] }} pid_file = {{ parameter_dict['pid-file'] }}
log_error = {{ parameter_dict['error-log'] }} log_error = {{ parameter_dict['error-log'] }}
slow_query_log slow_query_log
......
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