saltstack-formulas/mysql-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/mysql-formula.git synced 2025-04-16 09:40:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/pr/4'

Browse source
This commit is contained in:
Seth House 2013-08-27 14:29:55 -06:00
commit 04ad0754aa
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql/files/Debian-my.cnf
View file

@ -33,10 +33,10 @@ nice = 0
# #
# * Basic Settings # * Basic Settings
# #
user = {{ salt['pillar.get']('mysql:user', 'mysql') }} user = {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
pid-file = /var/run/mysqld/mysqld.pid pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock socket = /var/run/mysqld/mysqld.sock
port = {{ salt['pillar.get']('mysql:port', '3306') }} port = {{ salt['pillar.get']('mysql:server:port', '3306') }}
basedir = /usr basedir = /usr
datadir = /var/lib/mysql datadir = /var/lib/mysql
tmpdir = /tmp tmpdir = /tmp
@ -45,7 +45,7 @@ skip-external-locking
# #
# Instead of skip-networking the default is now to listen only on # Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure. # localhost which is more compatible and is not less secure.
bind-address = {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }} bind-address = {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
# #
# * Fine Tuning # * Fine Tuning
# #

6
mysql/files/Gentoo-my.cnf
View file

@ -45,8 +45,8 @@ err-log = /var/log/mysql/mysql.err
# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations # add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
[mysqld] [mysqld]
character-set-server = utf8 character-set-server = utf8
user = {{ salt['pillar.get']('mysql:user', 'mysql') }} user = {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
port = {{ salt['pillar.get']('mysql:port', '3306') }} port = {{ salt['pillar.get']('mysql:server:port', '3306') }}
socket = /var/run/mysqld/mysqld.sock socket = /var/run/mysqld/mysqld.sock
pid-file = /var/run/mysqld/mysqld.pid pid-file = /var/run/mysqld/mysqld.pid
log-error = /var/log/mysql/mysqld.err log-error = /var/log/mysql/mysqld.err
@ -66,7 +66,7 @@ language = /usr/share/mysql/english
# security: # security:
# using "localhost" in connects uses sockets by default # using "localhost" in connects uses sockets by default
# skip-networking # skip-networking
bind-address = {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }} bind-address = {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
log-bin log-bin
server-id = 1 server-id = 1

6
mysql/files/Ubuntu-my.cnf
View file

@ -33,10 +33,10 @@ nice = 0
# #
# * Basic Settings # * Basic Settings
# #
user = {{ salt['pillar.get']('mysql:user', 'mysql') }} user = {{ salt['pillar.get']('mysql:server:user', 'mysql') }}
pid-file = /var/run/mysqld/mysqld.pid pid-file = /var/run/mysqld/mysqld.pid
socket = /var/run/mysqld/mysqld.sock socket = /var/run/mysqld/mysqld.sock
port = {{ salt['pillar.get']('mysql:port', '3306') }} port = {{ salt['pillar.get']('mysql:server:port', '3306') }}
basedir = /usr basedir = /usr
datadir = /var/lib/mysql datadir = /var/lib/mysql
tmpdir = /tmp tmpdir = /tmp
@ -45,7 +45,7 @@ skip-external-locking
# #
# Instead of skip-networking the default is now to listen only on # Instead of skip-networking the default is now to listen only on
# localhost which is more compatible and is not less secure. # localhost which is more compatible and is not less secure.
bind-address = {{ salt['pillar.get']('mysql:bind-address', '127.0.0.1') }} bind-address = {{ salt['pillar.get']('mysql:server:bind-address', '127.0.0.1') }}
# #
# * Fine Tuning # * Fine Tuning
# #

2
mysql/package-map.jinja
View file

@ -20,4 +20,4 @@
'config': '/etc/mysql/my.cnf', 'config': '/etc/mysql/my.cnf',
'python': 'dev-python/mysql-python', 'python': 'dev-python/mysql-python',
}, },
}, merge=salt['pillar.get']('mysql:lookup')) %} }) %}