Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mysql/osfamilymap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -206,22 +206,22 @@ Gentoo:
interactive_timeout: noarg_present

FreeBSD:
serverpkg: mysql56-server
clientpkg: mysql56-client
serverpkg: mysql57-server
clientpkg: mysql57-client
service: mysql-server
pythonpkg: py27-pymysql
devpkg: mysql56-server
pythonpkg: py37-pymysql
devpkg: mysql57-server

config:
file: /usr/local/etc/my.cnf
file: /usr/local/etc/mysql/my.cnf
sections:
client:
socket: /tmp/mysql.sock
mysqld:
# Empty values below to be resolved, disabling the rule in the meantime
# yamllint disable rule:empty-values
user:
datadir:
datadir: /var/db/mysql
# yamllint enable rule:empty-values
socket: /tmp/mysql.sock
skip-external-locking: noarg_present
Expand Down
18 changes: 17 additions & 1 deletion mysql/server.sls
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,29 @@ mysql_initialize:
- pkg: {{ mysql.serverpkg }}
{%- endif %}

{%- if os_family in ['FreeBSD'] and mysql.serverpkg.lower() != 'mariadb-server' %}
mysql_initialize:
file.directory:
- name: /var/log/mysql
- user: mysql
- group: mysql
- mode: '0750'
cmd.run:
- name: /usr/local/libexec/mysqld --initialize-insecure --user=mysql --basedir=/usr/local --datadir={{ mysql_datadir }}
- runas: root
- creates: {{ mysql_datadir }}/mysql/
- require:
- pkg: {{ mysql.serverpkg }}
- file: /var/log/mysql
{%- endif %}

mysqld-service-running:
service.running:
- name: {{ mysql.service }}
- enable: True
- require:
- pkg: {{ mysql.serverpkg }}
{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo']) %}
{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo', 'FreeBSD']) %}
- cmd: mysql_initialize
{%- elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %}
- file: {{ mysql_datadir }}
Expand Down