From 6814254e3a137c1a3a7bdc17e3170b7c1005e76b Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 16:56:33 -0500 Subject: [PATCH 1/9] Added package-map.jinja, moved init to client Moved mysql-client package out of the server --- README.rst | 2 +- mysql/client.sls | 6 ++++++ mysql/init.sls | 9 --------- mysql/package-map.jinja | 36 ++++++++++++++++++++++++++++++++++++ mysql/server.sls | 22 +++++----------------- 5 files changed, 48 insertions(+), 27 deletions(-) create mode 100644 mysql/client.sls delete mode 100644 mysql/init.sls create mode 100644 mysql/package-map.jinja diff --git a/README.rst b/README.rst index 476f11d..2eb3683 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ Install the MySQL client and/or server Available states ---------------- -``mysql`` +``mysql.client`` Install the MySQL client package. ``mysql.server`` Install the MySQL server package and start the service. diff --git a/mysql/client.sls b/mysql/client.sls new file mode 100644 index 0000000..893e670 --- /dev/null +++ b/mysql/client.sls @@ -0,0 +1,6 @@ +{% from "salt/package-map.jinja" import pkgs with context %} + +mysql: + pkg: + - installed + - name: {{ pkgs['mysql-client'] }} diff --git a/mysql/init.sls b/mysql/init.sls deleted file mode 100644 index 715060a..0000000 --- a/mysql/init.sls +++ /dev/null @@ -1,9 +0,0 @@ -{% set pkg = salt['grains.filter_by']({ - 'Debian': {'name': 'mysql-client'}, - 'RedHat': {'name': 'mysql'}, -}) %} - -mysql: - pkg: - - installed - - name: {{ pkg.name }} diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja new file mode 100644 index 0000000..763ca00 --- /dev/null +++ b/mysql/package-map.jinja @@ -0,0 +1,36 @@ +{% set package_table = { + 'Debian': {'mysql-server': 'mysql-server', + 'mysql-client': 'mysql-client'}, + 'Ubuntu': {'mysql-server': 'mysql-server', + 'mysql-client': 'mysql-client'}, + 'CentOS': {'mysql-server': 'mysql-server', + 'mysql-client': 'mysql'}, + 'Fedora': {'mysql-server': 'mysql-server', + 'mysql-client': 'mysql'}, + 'RedHat': {'mysql-server': 'mysql-server', + 'mysql-client': 'mysql'}, + 'Gentoo': {'mysql-server': 'dev-db/mysql', + 'mysql-client': 'dev-db/mysql'}, +} %} + +{% if 'package_table' in pillar %} + {% set pkgs = pillar['package_table'] %} +{% elif grains['os'] in package_table %} + {% set pkgs = package_table[grains['os']] %} +{% endif %} + + +{% set service_table = { + 'Debian': {'mysql': 'mysql'}, + 'Ubuntu': {'mysql': 'mysql'}, + 'CentOS': {'mysql': 'mysqld'}, + 'Fedora': {'mysql': 'mysqld'}, + 'RedHat': {'mysql': 'mysqld'}, + 'Gentoo': {'mysql': 'mysql'} +} %} + +{% if 'service_table' in pillar %} + {% set services = pillar['service_table'] %} +{% elif grains['os'] in service_table %} + {% set services = service_table[grains['os']] %} +{% endif %} diff --git a/mysql/server.sls b/mysql/server.sls index 10592e4..9341255 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,24 +1,12 @@ -include: - - mysql - -{% set pkg = salt['grains.filter_by']({ - 'Debian': { - 'name': 'mysql-server', - 'service': 'mysql', - }, - 'RedHat': { - 'name': 'mysql-server', - 'service': 'mysqld', - }, -}) %} +{% from "salt/package-map.jinja" import pkgs with context %} mysqld: pkg: - installed - - name: {{ pkg.name }} + - name: {{ pkgs['mysql-server'] }} service: - running - - name: {{ pkg.service }} + - name: {{ services['mysql'] }} - enable: True - require: - - pkg: mysql + - watch: + - pkg: mysqld From 0b7b232934a0deba4a0e98e2bed47426a7aa016e Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 17:03:13 -0500 Subject: [PATCH 2/9] fixed import to include services --- mysql/client.sls | 2 +- mysql/server.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/client.sls b/mysql/client.sls index 893e670..09027f5 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs with context %} +{% from "salt/package-map.jinja" import pkgs, services with context %} mysql: pkg: diff --git a/mysql/server.sls b/mysql/server.sls index 9341255..17ab292 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs with context %} +{% from "salt/package-map.jinja" import pkgs, services with context %} mysqld: pkg: From baba65b7b199cba2e090a331a0510fb325fa54da Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 17:08:42 -0500 Subject: [PATCH 3/9] test --- mysql/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index 17ab292..9341255 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs, services with context %} +{% from "salt/package-map.jinja" import pkgs with context %} mysqld: pkg: From 15236beccf9f95c2503ce546155fb369e1430623 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 17:09:33 -0500 Subject: [PATCH 4/9] test --- mysql/client.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/client.sls b/mysql/client.sls index 09027f5..893e670 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs, services with context %} +{% from "salt/package-map.jinja" import pkgs with context %} mysql: pkg: From 753936fff733f5f0a59ca9ffacef114096ff9b50 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 17:10:58 -0500 Subject: [PATCH 5/9] derp fix --- mysql/client.sls | 2 +- mysql/server.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/client.sls b/mysql/client.sls index 893e670..6a03170 100644 --- a/mysql/client.sls +++ b/mysql/client.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs with context %} +{% from "mysql/package-map.jinja" import pkgs, services with context %} mysql: pkg: diff --git a/mysql/server.sls b/mysql/server.sls index 9341255..563f3fc 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "salt/package-map.jinja" import pkgs with context %} +{% from "mysql/package-map.jinja" import pkgs with context %} mysqld: pkg: From 3da921ae654e666d02e9ae2ed006242965511985 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Thu, 15 Aug 2013 17:19:26 -0500 Subject: [PATCH 6/9] readded services to server --- mysql/server.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql/server.sls b/mysql/server.sls index 563f3fc..5b9dbf6 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "mysql/package-map.jinja" import pkgs with context %} +{% from "mysql/package-map.jinja" import pkgs, services with context %} mysqld: pkg: From 4d940f9ecfd63290ad3f5c632f1c7eebb83bf3f0 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Mon, 19 Aug 2013 10:03:59 -0500 Subject: [PATCH 7/9] Started work on mysqld config templates --- mysql/files/Debian-my.cnf | 128 +++++++++++++++++++++++++++++++ mysql/files/Gentoo-my.cnf | 148 ++++++++++++++++++++++++++++++++++++ mysql/files/Ubuntu-my.cnf | 129 +++++++++++++++++++++++++++++++ mysql/package-map.jinja | 16 ++++ mysql/pillar-settings.jinja | 2 + mysql/server.sls | 13 +++- pillar.example | 5 ++ 7 files changed, 440 insertions(+), 1 deletion(-) create mode 100644 mysql/files/Debian-my.cnf create mode 100644 mysql/files/Gentoo-my.cnf create mode 100644 mysql/files/Ubuntu-my.cnf create mode 100644 mysql/pillar-settings.jinja diff --git a/mysql/files/Debian-my.cnf b/mysql/files/Debian-my.cnf new file mode 100644 index 0000000..1d88312 --- /dev/null +++ b/mysql/files/Debian-my.cnf @@ -0,0 +1,128 @@ +{% from "mysql/pillar-settings.jinja" import server %} +# This file managed by Salt, do not edit by hand!! +# +# The MySQL database server configuration file. +# +# You can copy this to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = {{ server.get('user', 'mysql') }} +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = {{ server.get('port', '3306') }} +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +{{ if pillar +bind-address = {{ server.get('bind-address', '127.0.0.1') }} +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +#max_connections = 100 +#table_cache = 64 +#thread_concurrency = 10 +# +# * Query Cache Configuration +# +query_cache_limit = 1M +query_cache_size = 16M +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. +# +# Here you can see queries with especially long duration +#log_slow_queries = /var/log/mysql/mysql-slow.log +#long_query_time = 2 +#log-queries-not-using-indexes +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + + + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completition + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/ diff --git a/mysql/files/Gentoo-my.cnf b/mysql/files/Gentoo-my.cnf new file mode 100644 index 0000000..a413824 --- /dev/null +++ b/mysql/files/Gentoo-my.cnf @@ -0,0 +1,148 @@ +{% from "mysql/pillar-settings.jinja" import server %} +# This file managed by Salt, do not edit by hand!! +# /etc/mysql/my.cnf: The global mysql configuration file. +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ + +# The following options will be passed to all MySQL clients +[client] +#password = your_password +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysql] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqladmin] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlcheck] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqldump] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlimport] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[mysqlshow] +character-sets-dir=/usr/share/mysql/charsets +default-character-set=utf8 + +[myisamchk] +character-sets-dir=/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=/usr/share/mysql/charsets + +# use [safe_mysqld] with mysql-3 +[mysqld_safe] +err-log = /var/log/mysql/mysql.err + +# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations +[mysqld] +character-set-server = utf8 +user = {{ server.get('user', 'mysql') }} +port = {{ server.get('port', '3306') }} +socket = /var/run/mysqld/mysqld.sock +pid-file = /var/run/mysqld/mysqld.pid +log-error = /var/log/mysql/mysqld.err +basedir = /usr +datadir = /var/lib/mysql +skip-external-locking +key_buffer = 16M +max_allowed_packet = 1M +table_open_cache = 64 +sort_buffer_size = 512K +net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K +myisam_sort_buffer_size = 8M +language = /usr/share/mysql/english + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = {{ server.get('bind-address', '127.0.0.1') }} + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +tmpdir = /tmp/ +#log-update = /path-to-dedicated-directory/hostname + +# you need the debug USE flag enabled to use the following directives, +# if needed, uncomment them, start the server and issue +# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace +# this will show you *exactly* what's happening in your server ;) + +#log = /tmp/mysqld.sql +#gdb +#debug = d:t:i:o,/tmp/mysqld.trace +#one-thread + +# uncomment the following directives if you are using BDB tables +#bdb_cache_size = 4M +#bdb_max_lock = 10000 + +# the following is the InnoDB configuration +# if you wish to disable innodb instead +# uncomment just the next line +#skip-innodb +# +# the rest of the innodb config follows: +# don't eat too much memory, we're trying to be safe on 64Mb boxes +# you might want to bump this up a bit on boxes with more RAM +innodb_buffer_pool_size = 16M +# this is the default, increase it if you have lots of tables +innodb_additional_mem_pool_size = 2M +# +# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-( +# and upstream wants things to be under /var/lib/mysql/, so that's the route +# we have to take for the moment +#innodb_data_home_dir = /var/lib/mysql/ +#innodb_log_arch_dir = /var/lib/mysql/ +#innodb_log_group_home_dir = /var/lib/mysql/ +# you may wish to change this size to be more suitable for your system +# the max is there to avoid run-away growth on your machine +innodb_data_file_path = ibdata1:10M:autoextend:max:128M +# we keep this at around 25% of of innodb_buffer_pool_size +# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size) +innodb_log_file_size = 5M +# this is the default, increase it if you have very large transactions going on +innodb_log_buffer_size = 8M +# this is the default and won't hurt you +# you shouldn't need to tweak it +innodb_log_files_in_group=2 +# see the innodb config docs, the other options are not always safe +innodb_flush_log_at_trx_commit = 1 +innodb_lock_wait_timeout = 50 +innodb_file_per_table + +[mysqldump] +quick +max_allowed_packet = 16M + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[isamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[myisamchk] +key_buffer = 20M +sort_buffer_size = 20M +read_buffer = 2M +write_buffer = 2M + +[mysqlhotcopy] +interactive-timeout diff --git a/mysql/files/Ubuntu-my.cnf b/mysql/files/Ubuntu-my.cnf new file mode 100644 index 0000000..4cc7440 --- /dev/null +++ b/mysql/files/Ubuntu-my.cnf @@ -0,0 +1,129 @@ +{% from "mysql/pillar-settings.jinja" import server %} +# This file managed by Salt, do not edit by hand!! +# +# The MySQL database server configuration file. +# +# You can copy this to one of: +# - "/etc/mysql/my.cnf" to set global options, +# - "~/.my.cnf" to set user-specific options. +# +# One can use all long options that the program supports. +# Run program with --help to get a list of available options and with +# --print-defaults to see which it would actually understand and use. +# +# For explanations see +# http://dev.mysql.com/doc/mysql/en/server-system-variables.html + +# This will be passed to all mysql clients +# It has been reported that passwords should be enclosed with ticks/quotes +# escpecially if they contain "#" chars... +# Remember to edit /etc/mysql/debian.cnf when changing the socket location. +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +# Here is entries for some specific programs +# The following values assume you have at least 32M ram + +# This was formally known as [safe_mysqld]. Both versions are currently parsed. +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +# +# * Basic Settings +# +user = {{ server.get('user', 'mysql') }} +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = {{ server.get('port', '3306') }} +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking +# +# Instead of skip-networking the default is now to listen only on +# localhost which is more compatible and is not less secure. +bind-address = {{ server.get('bind-address', '127.0.0.1') }} +# +# * Fine Tuning +# +key_buffer = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +# This replaces the startup script and checks MyISAM tables if needed +# the first time they are touched +myisam-recover = BACKUP +#max_connections = 100 +#table_cache = 64 +#thread_concurrency = 10 +# +# * Query Cache Configuration +# +query_cache_limit = 1M +query_cache_size = 16M +# +# * Logging and Replication +# +# Both location gets rotated by the cronjob. +# Be aware that this log type is a performance killer. +# As of 5.1 you can enable the log at runtime! +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +# +# Error log - should be very few entries. +# +log_error = /var/log/mysql/error.log +# +# Here you can see queries with especially long duration +#log_slow_queries = /var/log/mysql/mysql-slow.log +#long_query_time = 2 +#log-queries-not-using-indexes +# +# The following can be used as easy to replay backup logs or for replication. +# note: if you are setting up a replication slave, see README.Debian about +# other settings you may need to change. +#server-id = 1 +#log_bin = /var/log/mysql/mysql-bin.log +expire_logs_days = 10 +max_binlog_size = 100M +#binlog_do_db = include_database_name +#binlog_ignore_db = include_database_name +# +# * InnoDB +# +# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/. +# Read the manual for more InnoDB related options. There are many! +# +# * Security Features +# +# Read the manual, too, if you want chroot! +# chroot = /var/lib/mysql/ +# +# For generating SSL certificates I recommend the OpenSSL GUI "tinyca". +# +# ssl-ca=/etc/mysql/cacert.pem +# ssl-cert=/etc/mysql/server-cert.pem +# ssl-key=/etc/mysql/server-key.pem + + + +[mysqldump] +quick +quote-names +max_allowed_packet = 16M + +[mysql] +#no-auto-rehash # faster start of mysql but no tab completition + +[isamchk] +key_buffer = 16M + +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# +!includedir /etc/mysql/conf.d/ diff --git a/mysql/package-map.jinja b/mysql/package-map.jinja index 763ca00..6d35ebe 100644 --- a/mysql/package-map.jinja +++ b/mysql/package-map.jinja @@ -34,3 +34,19 @@ {% elif grains['os'] in service_table %} {% set services = service_table[grains['os']] %} {% endif %} + + +{% set config_table = { + 'Debian': {'mysql': '/etc/mysql/my.cnf'}, + 'Ubuntu': {'mysql': '/etc/mysql/my.cnf'}, + 'CentOS': {'mysql': '/etc/my.cnf'}, + 'Fedora': {'mysql': '/etc/my.cnf'}, + 'RedHat': {'mysql': '/etc/my.cnf'}, + 'Gentoo': {'mysql': '/etc/mysql/my.cnf'} +} %} + +{% if 'config_table' in pillar %} + {% set configs = pillar['config_table'] %} +{% elif grains['os'] in config_table %} + {% set configs = config_table[grains['os']] %} +{% endif %} diff --git a/mysql/pillar-settings.jinja b/mysql/pillar-settings.jinja new file mode 100644 index 0000000..ed7de25 --- /dev/null +++ b/mysql/pillar-settings.jinja @@ -0,0 +1,2 @@ +{% set mysql = pillar.get('mysql', {}) -%} +{% set server = mysql.get('server', {}) -%} diff --git a/mysql/server.sls b/mysql/server.sls index 5b9dbf6..67a224b 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -1,4 +1,4 @@ -{% from "mysql/package-map.jinja" import pkgs, services with context %} +{% from "mysql/package-map.jinja" import pkgs, services, configs with context %} mysqld: pkg: @@ -10,3 +10,14 @@ mysqld: - enable: True - watch: - pkg: mysqld + +{% if grains['os'] in ['Ubuntu', 'Debian', 'Gentoo'] %} +my.cnf: + file.managed: + - name: {{ configs['mysql'] }} + - source: salt://mysql/files/{{ grains['os'] }}-my.cnf + - user: root + - group: root + - mode: 644 + - template: jinja +{% endif %} diff --git a/pillar.example b/pillar.example index e69de29..262847e 100644 --- a/pillar.example +++ b/pillar.example @@ -0,0 +1,5 @@ +mysql: + server: + bind-address: 127.0.0.1 + port: 3306 + user: mysql From 1978f98cd44698fcc41b842e080f509c501015a6 Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Mon, 19 Aug 2013 10:13:19 -0500 Subject: [PATCH 8/9] added context to template imports --- mysql/files/Debian-my.cnf | 3 +-- mysql/files/Gentoo-my.cnf | 2 +- mysql/files/Ubuntu-my.cnf | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mysql/files/Debian-my.cnf b/mysql/files/Debian-my.cnf index 1d88312..2d0c540 100644 --- a/mysql/files/Debian-my.cnf +++ b/mysql/files/Debian-my.cnf @@ -1,4 +1,4 @@ -{% from "mysql/pillar-settings.jinja" import server %} +{% from "mysql/pillar-settings.jinja" import server with context %} # This file managed by Salt, do not edit by hand!! # # The MySQL database server configuration file. @@ -46,7 +46,6 @@ skip-external-locking # # Instead of skip-networking the default is now to listen only on # localhost which is more compatible and is not less secure. -{{ if pillar bind-address = {{ server.get('bind-address', '127.0.0.1') }} # # * Fine Tuning diff --git a/mysql/files/Gentoo-my.cnf b/mysql/files/Gentoo-my.cnf index a413824..ecb0c39 100644 --- a/mysql/files/Gentoo-my.cnf +++ b/mysql/files/Gentoo-my.cnf @@ -1,4 +1,4 @@ -{% from "mysql/pillar-settings.jinja" import server %} +{% from "mysql/pillar-settings.jinja" import server with context %} # This file managed by Salt, do not edit by hand!! # /etc/mysql/my.cnf: The global mysql configuration file. # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-5.1,v 1.4 2013/01/20 02:40:02 robbat2 Exp $ diff --git a/mysql/files/Ubuntu-my.cnf b/mysql/files/Ubuntu-my.cnf index 4cc7440..7e10c64 100644 --- a/mysql/files/Ubuntu-my.cnf +++ b/mysql/files/Ubuntu-my.cnf @@ -1,4 +1,4 @@ -{% from "mysql/pillar-settings.jinja" import server %} +{% from "mysql/pillar-settings.jinja" import server with context %} # This file managed by Salt, do not edit by hand!! # # The MySQL database server configuration file. From c252f2988e2474bc1e1ceea13f6937f9ac40757d Mon Sep 17 00:00:00 2001 From: Kenneth Wilke Date: Mon, 19 Aug 2013 10:15:22 -0500 Subject: [PATCH 9/9] added watch_in for mysqld conf --- mysql/server.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql/server.sls b/mysql/server.sls index 67a224b..031d4de 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -20,4 +20,6 @@ my.cnf: - group: root - mode: 644 - template: jinja + - watch_in: + - service: mysqld {% endif %}