Skip to content

Commit

Permalink
Merge pull request #307 from phlipper/old_passwords
Browse files Browse the repository at this point in the history
Define old_passwords only when there is a value defined. #304
  • Loading branch information
phlipper committed May 16, 2015
2 parents c1b8684 + 672ed96 commit 3d23478
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -732,6 +732,7 @@ Many thanks go to the following [contributors](https://github.com/phlipper/chef-
* **[@bitpusher-real](https://github.com/bitpusher-real)**
* add `binlog_ignore_db attribute` attribute
* add version restrictions on three MySQL directives
* only set `old_passwords` only when a value defined


## License
Expand Down
2 changes: 2 additions & 0 deletions templates/default/my.cnf.cluster.erb
Expand Up @@ -91,10 +91,12 @@ innodb_locks_unsafe_for_binlog = <%= node["percona"]["cluster"]["innodb_locks_un
innodb_autoinc_lock_mode = <%= node["percona"]["cluster"]["innodb_autoinc_lock_mode"] %>
<% if @old_passwords %>
#
# For compatibility to other Debian packages that still use
# libmysqlclient10 and libmysqlclient12.
old_passwords = <%= @old_passwords %>
<% end %>

#
# Instead of skip-networking the default is now to listen only on
Expand Down
2 changes: 2 additions & 0 deletions templates/default/my.cnf.main.erb
Expand Up @@ -74,10 +74,12 @@ net_read_timeout = <%= node["percona"]["server"]["net_read_timeout"] %>
connect_timeout = <%= node["percona"]["server"]["connect_timeout"] %>
wait_timeout = <%= node["percona"]["server"]["wait_timeout"] %>
<% if @old_passwords %>
#
# For compatibility to other Debian packages that still use
# libmysqlclient10 and libmysqlclient12.
old_passwords = <%= @old_passwords %>
<% end %>

#
# Instead of skip-networking the default is now to listen only on
Expand Down

0 comments on commit 3d23478

Please sign in to comment.