Page MenuHomeDevCentral
Files F13858148

D3890.id.diff
No OneTemporary
Actions

D3890.id.diff
View Options

diff --git a/roles/dbserver-mysql/mysql-server/cnf.sls b/roles/dbserver-mysql/mysql-server/cnf.sls
--- a/roles/dbserver-mysql/mysql-server/cnf.sls
+++ b/roles/dbserver-mysql/mysql-server/cnf.sls
@@ -21,12 +21,6 @@
- group: mysql
- dir_mode: 755
-/var/db/mysql:
- file.directory:
- - user: mysql
- - group: mysql
- - dir_mode: 755
-
{{ dirs.etc }}/mysql:
file.directory:
- user: root
diff --git a/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf b/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
--- a/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
+++ b/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
@@ -32,7 +32,7 @@
basedir = /usr
tmpdir = /tmp
-datadir = /var/db/mysql
+datadir = /var/db/mysql/data
lc-messages-dir = {{ share }}/mysql
bind-address = {{ listen_ip }}
diff --git a/roles/dbserver-mysql/mysql-server/files/mysql.rc b/roles/dbserver-mysql/mysql-server/files/mysql.rc
--- a/roles/dbserver-mysql/mysql-server/files/mysql.rc
+++ b/roles/dbserver-mysql/mysql-server/files/mysql.rc
@@ -10,4 +10,4 @@
mysql_rundir="/var/run/mysql"
mysql_pidfile="/var/run/mysql/mysqld.pid"
-mysql_dbdir=/var/db/mysql
+mysql_dbdir=/var/db/mysql/data
diff --git a/roles/dbserver-mysql/mysql-server/software.sls b/roles/dbserver-mysql/mysql-server/software.sls
--- a/roles/dbserver-mysql/mysql-server/software.sls
+++ b/roles/dbserver-mysql/mysql-server/software.sls
@@ -16,3 +16,15 @@
pkg.installed:
- pkgs:
- {{ packages.mariadb }}
+
+# -------------------------------------------------------------
+# Root directory for MySQL
+#
+# :: /var/db/mysql is required by both zfs and cnf states
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+/var/db/mysql:
+ file.directory:
+ - user: mysql
+ - group: mysql
+ - dir_mode: 755
diff --git a/roles/dbserver-mysql/mysql-server/zfs.sls b/roles/dbserver-mysql/mysql-server/zfs.sls
--- a/roles/dbserver-mysql/mysql-server/zfs.sls
+++ b/roles/dbserver-mysql/mysql-server/zfs.sls
@@ -14,7 +14,7 @@
zfs.filesystem_present:
# This one is optimized for MyISAM
- properties:
- mountpoint: /var/db/mysql
+ mountpoint: /var/db/mysql/data
compression: lz4
recordsize: 8K

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 26, 11:20 (6 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3206124
Default Alt Text
D3890.id.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator