Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147076
Change subject: mysql_multi_instance: qualify port
......................................................................
mysql_multi_instance: qualify port
Change-Id: Ie563450a234bd12906d361664313eb4838f14eed
---
M modules/mysql_multi_instance/templates/mysql.init.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/147076/1
diff --git a/modules/mysql_multi_instance/templates/mysql.init.erb
b/modules/mysql_multi_instance/templates/mysql.init.erb
index 1e5e3b2..dc73b25 100755
--- a/modules/mysql_multi_instance/templates/mysql.init.erb
+++ b/modules/mysql_multi_instance/templates/mysql.init.erb
@@ -44,7 +44,7 @@
# overwritten by settings in the MySQL configuration files.
basedir=/usr
-datadir=/a/sqldata.<%= port %>
+datadir=/a/sqldata.<%= @port %>
# Default value, in seconds, afterwhich the script should timeout waiting
# for server start.
@@ -215,7 +215,7 @@
print_defaults="$bindir/mysql_print_defaults"
else
# Try to find basedir in /etc/my.cnf
- conf=/etc/mysql/my.cnf.<%= port %>
+ conf=/etc/mysql/my.cnf.<%= @port %>
print_defaults=
if test -r $conf
then
@@ -327,7 +327,7 @@
# Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade.
pid_file=$server_pid_file
- $bindir/mysqld_safe --defaults-file=/etc/mysql/my.cnf.<%= port %>
--datadir=$datadir --pid-file=$server_pid_file $other_args >/dev/null 2>&1 &
+ $bindir/mysqld_safe --defaults-file=/etc/mysql/my.cnf.<%= @port %>
--datadir=$datadir --pid-file=$server_pid_file $other_args >/dev/null 2>&1 &
wait_for_pid created $!; return_value=$?
# Make lock for RedHat / SuSE
--
To view, visit https://gerrit.wikimedia.org/r/147076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie563450a234bd12906d361664313eb4838f14eed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
