Commit graph

237 commits

Author SHA1 Message Date
Joe Julian
703388ec05 Fix broken GRANT when not ssl
if ssl_option is not False, mysql_grant.present adds "REQUIRE" to the
grant command but since all the ssl sub options are false or missing,
there is a null string appended to the requirements. This causes the
grant command to fail.

This tests to see if ssl or X509 are set. If they're not, it skips the
entire ssl_option section leaving ssl_option==False to prevent that
error.
2016-09-07 09:32:55 -07:00
Niels Abspoel
c6674034ee Merge pull request #135 from toanju/fix-defaults
galera: fix invalid default
2016-08-31 16:27:36 +02:00
Tobias Jungel
55f14c2689 galera: fix invalid default
wsrep_notify_cmd cannot be without a value
2016-08-31 16:23:34 +02:00
Forrest
a5e5b8c544 Merge pull request #134 from toanju/add_galera_config
Adding galera config file
2016-08-30 09:41:14 -07:00
Tobias Jungel
6e123c1017 Adding galera config file
Added galera.cnf to support configuration of galera setups. Defaults
were added for Fedora based on Fedora 23 configuration defaults.
2016-08-30 09:21:19 +02:00
Forrest
f453abc465 Merge pull request #133 from toanju/update-sections
allow section galera to be configured
2016-08-28 11:15:57 -07:00
Forrest
ce2eebd521 Merge pull request #132 from toanju/fix-pid-default
prevent multiple configuration of pid file
2016-08-28 11:15:42 -07:00
Tobias Jungel
11a9e9893b allow section galera to be configured 2016-08-28 14:47:25 +02:00
Tobias Jungel
345bd16148 prevent multiple configuration of pid file
update default of pid-file to pid_file. Otherwise pid-file ends up always
in server.cnf and cannot be overriden, since all keys are modified to
use only underscores.
2016-08-28 14:40:07 +02:00
Forrest
78ef0b738b Merge pull request #129 from stokbaek/master
Added support for require SSL on user creation
2016-08-16 09:12:22 -07:00
Christoffer Stokbaek
0afbd11a21 Added pillar data for SSL option 2016-08-16 14:19:53 +02:00
Christoffer Stokbaek
f0f65c9248 Added support for require SSL on user creation 2016-08-15 13:24:40 +02:00
Forrest
04c8db5fc0 Merge pull request #128 from dijit/master
This default is not overridden properly for some reason
2016-08-04 11:10:01 -07:00
Jan Harasym
3318edd436 This default is not overridden properly for some reason 2016-08-04 11:26:22 +02:00
Forrest
7e94d486a6 Merge pull request #121 from aboe76/fix_archlinux
fix archlinux package
2016-05-25 14:01:07 -07:00
Niels Abspoel
b4cf406f13 fix archlinux package 2016-05-25 22:57:24 +02:00
Niels Abspoel
9cda382f1c Merge pull request #117 from srse/debian_fix
fixed /etc/mysql/my.cnf creation failure in debian
2016-04-14 12:35:36 +02:00
Sarah Rose
6f429a89e2 fixed /etc/mysql/my.cnf creation failure in debian
the config file update depends on the parent directory /etc/mysql being present, which is created as part of the mysql-server package installation. therefore, the mysqld state is split up for debian environments into the package installation and the mysqld configuration. this allows to set the pkg installation as a requirement for the config file management and to set the config file management as a requirement for the mysqld service management
2016-04-12 17:43:54 +02:00
Forrest
4cb99e9bd9 Merge pull request #116 from M2Mobi/mine
Add support for fetching user hosts from salt mine.
2016-04-06 11:47:12 -07:00
Heinz Wiesinger
22d08ec1f3 Add support for fetching user hosts from salt mine. 2016-04-06 12:15:42 +02:00
Forrest
7c683825e6 Merge pull request #113 from Ismail-AlJubbah/patch-1
Update server.cnf
2016-03-29 00:14:15 -07:00
Ismail Al-Jubbah
378fcd514c Update server.cnf 2016-03-29 15:04:15 +08:00
Forrest
9152d88cbf Merge pull request #109 from HealthForge/master
Allow loading into remote databases
2016-02-25 10:49:55 -08:00
jam13
3bc30263c3 Allow loading into remote databases 2016-02-25 17:08:16 +00:00
Forrest
83b865ae14 Merge pull request #108 from tsia/master
fix defaults.yaml to support mysql5.7
2016-02-08 11:12:06 -08:00
tsia
85953b0cc4 fix defaults.yaml to support mysql5.7 2016-02-08 16:56:56 +01:00
Wolodja Wentland
d09be37103 Merge pull request #105 from arthurlogilab/patch-1
typo in comment
2016-01-28 14:13:31 +01:00
Arthur Lutz
a4c87ee46e typo in comment 2016-01-28 12:53:26 +01:00
Nitin Madhok
8a59137dc4 Merge pull request #96 from M2Mobi/master
Add better support for a config directory with split config files.
2015-11-24 02:12:56 -05:00
puneet kandhari
2f9a1ab686 Merge pull request #101 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
2015-11-17 07:28:06 -06:00
abednarik
01779eb50a Replace deprecated iteritems() with items() 2015-11-17 10:22:38 -03:00
Forrest
42b697d4c0 Merge pull request #99 from M2Mobi/user-rebased
Fix wrong variable name for the salt user password in some files.
2015-10-09 12:47:03 -07:00
Heinz Wiesinger
becff9fcdd Fix wrong variable name for the salt user password in some files. 2015-10-09 10:12:32 +02:00
Forrest
0ad3e7b710 Merge pull request #98 from M2Mobi/user-rebased
Add states for optional dedicated salt user instead of root.
2015-10-08 14:13:03 -07:00
Heinz Wiesinger
e72c1c12d3 Add states for optional dedicated salt user instead of root. 2015-10-08 17:40:04 +02:00
Heinz Wiesinger
0febad19c1 Add better support for a config directory with split config files.
This adds optional support for having split configuration files
within a config directory, most commonly /etc/my.cnf.d.
2015-10-05 21:50:19 +02:00
Forrest
a874ed3840 Merge pull request #97 from M2Mobi/whitespace
Fix trailing whitespaces.
2015-10-05 12:49:24 -07:00
Heinz Wiesinger
d15e431468 Fix trailing whitespaces. 2015-10-05 21:44:20 +02:00
Forrest
e46262c0a8 Merge pull request #95 from ogabrielsantos/master
Fix empty "mysql_install_datadir" dict when OS family is not "Arch"
2015-09-29 23:03:32 -07:00
Gabriel Santos
9fa1ddd59e Finish fix-mysql_install_datadir-issue 2015-09-30 02:34:43 -03:00
Gabriel Santos
27d9e68558 Fix empty "mysql_install_datadir" dict when OS family is not "Arch" 2015-09-30 02:34:24 -03:00
Forrest
d6a4a1a214 Merge pull request #94 from roock/archlinux
Archlinux - create initial mysql data directory
2015-09-29 13:43:19 -07:00
Roman Pertl
1d73a3582d remove creation of logdir again 2015-09-29 20:03:00 +00:00
Roman Pertl
1319eaf7da Revert "bugfix: remove anonymous accounts on all os, fix condition os_family for mysql root password"
This reverts commit 24f54ee98c.
2015-09-29 19:46:58 +00:00
Roman Pertl
eac19e4e5f fix auto creation of mysql initial data directory on arch linux; create logging directory 2015-09-29 19:46:15 +00:00
Roman Pertl
5b7aad5bc9 Arch Linux: create initial mysql data directory 2015-09-29 18:55:24 +00:00
Roman Pertl
429aba9ec9 Merge branch 'master' of https://github.com/saltstack-formulas/mysql-formula 2015-09-29 18:54:52 +00:00
Roman Pertl
24f54ee98c bugfix: remove anonymous accounts on all os, fix condition os_family for mysql root password 2015-09-29 18:53:29 +00:00
puneet kandhari
61d2a3ef01 Merge pull request #91 from RonWilliams/master
Fix database administrative user within database import command
2015-09-24 21:17:11 -05:00
Ron Williams
8b0c7cc71d Fix database administrative user within database import command. 2015-09-24 19:30:03 -06:00