diff --git a/mysql/files/CentOS-my.cnf b/mysql/files/CentOS-my.cnf deleted file mode 100644 index 69fe12c..0000000 --- a/mysql/files/CentOS-my.cnf +++ /dev/null @@ -1,13 +0,0 @@ -[mysqld] -datadir=/var/lib/mysql -socket=/var/lib/mysql/mysql.sock -user={{ salt['pillar.get']('mysql:server:user', 'mysql') }} -port={{ salt['pillar.get']('mysql:server:port', '3306') }} -bind-address={{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }} -# Disabling symbolic-links is recommended to prevent assorted security risks -symbolic-links=0 - -[mysqld_safe] -log-error=/var/log/mysqld.log -pid-file=/var/run/mysqld/mysqld.pid - diff --git a/mysql/server.sls b/mysql/server.sls index 08cc322..f341577 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -61,7 +61,7 @@ mysql_config: - watch_in: - service: mysqld {% if os_family in ['Debian', 'Gentoo', 'RedHat'] %} - - source: salt://mysql/files/{{ os }}-my.cnf + - source: salt://mysql/files/{{ os_family }}-my.cnf - user: root - group: root - mode: 644