[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: remove unnecessary -p${mysql::root_password} usage
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400119 )
Change subject: mysql: remove unnecessary -p${mysql::root_password} usage
..
mysql: remove unnecessary -p${mysql::root_password} usage
The root user is setup to use unix auth rather than password auth, so
passing a password to /usr/bin/mysql is unnecessary.
Bug: T51652
Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
---
M puppet/modules/crm/manifests/dash.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/smashpig/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/crm/manifests/dash.pp
b/puppet/modules/crm/manifests/dash.pp
index 30371c3..5070bab 100644
--- a/puppet/modules/crm/manifests/dash.pp
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -34,7 +34,7 @@
}
exec { 'dash_schema':
-command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql
-u root -p${mysql::root_password} fredge -qfsA",
+command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql
fredge -qfsA",
require => [
File['dash_settings_js'],
Mysql::Db['fredge'],
diff --git a/puppet/modules/role/manifests/ores.pp
b/puppet/modules/role/manifests/ores.pp
index 338a8a2..ae9555e 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -27,7 +27,7 @@
mediawiki::maintenance { 'check ORES model versions':
command => '/usr/local/bin/mwscript
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless => "/usr/bin/mysql -u root -p${::mysql::root_password} -e
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
+unless => "/usr/bin/mysql -e 'select * from ores_model' wiki |
/bin/grep -q 'damaging'",
require => Mediawiki::Extension['ORES'],
}
diff --git a/puppet/modules/smashpig/manifests/init.pp
b/puppet/modules/smashpig/manifests/init.pp
index 62feda9..3cf65d8 100644
--- a/puppet/modules/smashpig/manifests/init.pp
+++ b/puppet/modules/smashpig/manifests/init.pp
@@ -64,7 +64,7 @@
mysql::db { 'smashpig': }
exec { 'smashpig_schema':
-command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql -uroot
-p${mysql::root_password} smashpig -qfsA",
+command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql smashpig
-qfsA",
require => [
Git::Clone['wikimedia/fundraising/SmashPig'],
Mysql::Db['smashpig'],
--
To view, visit https://gerrit.wikimedia.org/r/400119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Ejegg
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: mysql: remove unnecessary -p${mysql::root_password} usage
BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400119 )
Change subject: mysql: remove unnecessary -p${mysql::root_password} usage
..
mysql: remove unnecessary -p${mysql::root_password} usage
The root user is setup to use unix auth rather than password auth, so
passing a password to /usr/bin/mysql is unnecessary.
Bug: T51652
Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
---
M puppet/modules/crm/manifests/dash.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/smashpig/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/19/400119/1
diff --git a/puppet/modules/crm/manifests/dash.pp
b/puppet/modules/crm/manifests/dash.pp
index 30371c3..5070bab 100644
--- a/puppet/modules/crm/manifests/dash.pp
+++ b/puppet/modules/crm/manifests/dash.pp
@@ -34,7 +34,7 @@
}
exec { 'dash_schema':
-command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql
-u root -p${mysql::root_password} fredge -qfsA",
+command => "cat ${fundraising_dash_dir}/schema/*.sql | /usr/bin/mysql
fredge -qfsA",
require => [
File['dash_settings_js'],
Mysql::Db['fredge'],
diff --git a/puppet/modules/role/manifests/ores.pp
b/puppet/modules/role/manifests/ores.pp
index 8651e0e..de444c7 100644
--- a/puppet/modules/role/manifests/ores.pp
+++ b/puppet/modules/role/manifests/ores.pp
@@ -27,7 +27,7 @@
mediawiki::maintenance { 'check ORES model versions':
command => '/usr/local/bin/mwscript
extensions/ORES/maintenance/CheckModelVersions.php --wiki=wiki',
-unless => "/usr/bin/mysql -u root -p${::mysql::root_password} -e
'select * from ores_model' wiki | /bin/grep -q 'damaging'",
+unless => "/usr/bin/mysql -e 'select * from ores_model' wiki |
/bin/grep -q 'damaging'",
require => Mediawiki::Extension['ORES'],
}
diff --git a/puppet/modules/smashpig/manifests/init.pp
b/puppet/modules/smashpig/manifests/init.pp
index 62feda9..3cf65d8 100644
--- a/puppet/modules/smashpig/manifests/init.pp
+++ b/puppet/modules/smashpig/manifests/init.pp
@@ -64,7 +64,7 @@
mysql::db { 'smashpig': }
exec { 'smashpig_schema':
-command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql -uroot
-p${mysql::root_password} smashpig -qfsA",
+command => "cat ${dir}/Schema/mysql/*.sql | /usr/bin/mysql smashpig
-qfsA",
require => [
Git::Clone['wikimedia/fundraising/SmashPig'],
Mysql::Db['smashpig'],
--
To view, visit https://gerrit.wikimedia.org/r/400119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf27465c901efa341241f210d526eb10684eeb33
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
