Changed the grain os to os_family

This commit is contained in:
Alfons Foubert 2014-09-26 13:35:53 +02:00
parent 7c51515a87
commit ffff679528
2 changed files with 1 additions and 14 deletions

View file

@ -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

View file

@ -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