Pyoungmeister has uploaded a new change for review. https://gerrit.wikimedia.org/r/55432
Change subject: fixing up a couple of incorrect variable references ...................................................................... fixing up a couple of incorrect variable references Change-Id: I3df5ec7a60fa936a1b2e548ab2f04fc14b6c8cc5 --- M modules/mysql/templates/my.cnf.erb M modules/mysql/templates/mysql.init.erb 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/55432/1 diff --git a/modules/mysql/templates/my.cnf.erb b/modules/mysql/templates/my.cnf.erb index 7af0361..1695d5f 100644 --- a/modules/mysql/templates/my.cnf.erb +++ b/modules/mysql/templates/my.cnf.erb @@ -50,7 +50,7 @@ [isamchk] key_buffer = 16M <% if multi_instance == true -%> -!include /etc/mysql/conf.d/my.cnf.$port +!include /etc/mysql/conf.d/my.cnf.<%= port %> <% else %> !includedir /etc/mysql/conf.d/ <% end -%> diff --git a/modules/mysql/templates/mysql.init.erb b/modules/mysql/templates/mysql.init.erb index c10829f..8aef417 100755 --- a/modules/mysql/templates/mysql.init.erb +++ b/modules/mysql/templates/mysql.init.erb @@ -215,7 +215,7 @@ print_defaults="$bindir/mysql_print_defaults" else # Try to find basedir in /etc/my.cnf - conf=<%= $mysql::config::config_file %> + conf=/etc/my.cnf.<%= port %> print_defaults= if test -r $conf then -- To view, visit https://gerrit.wikimedia.org/r/55432 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3df5ec7a60fa936a1b2e548ab2f04fc14b6c8cc5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Pyoungmeister <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
