Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280800
Change subject: Use resetUserEmail.php from core
......................................................................
Use resetUserEmail.php from core
Change-Id: I7d2cf288b6829a8680dad762d0e1b0bc21a36b09
---
M puppet/modules/mediawiki/manifests/user.pp
D puppet/modules/mediawiki/templates/set_user_email.erb
2 files changed, 1 insertion(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/00/280800/1
diff --git a/puppet/modules/mediawiki/manifests/user.pp
b/puppet/modules/mediawiki/manifests/user.pp
index a0e63a7..5c1c872 100644
--- a/puppet/modules/mediawiki/manifests/user.pp
+++ b/puppet/modules/mediawiki/manifests/user.pp
@@ -98,7 +98,7 @@
if $email {
mediawiki::maintenance {
"mediawiki_user_${canonical_username}_${wiki}_email":
- command => template('mediawiki/set_user_email.erb'),
+ command => "/usr/local/bin/mwscript resetUserEmail.php
--wiki='${wiki}' '${canonical_username}' '${email}' --no-reset-password",
refreshonly => true,
subscribe =>
Mediawiki::Maintenance["mediawiki_user_${canonical_username}_${wiki}"],
}
diff --git a/puppet/modules/mediawiki/templates/set_user_email.erb
b/puppet/modules/mediawiki/templates/set_user_email.erb
deleted file mode 100644
index ebe4e2d..0000000
--- a/puppet/modules/mediawiki/templates/set_user_email.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-/bin/echo '$u = User::newFromName( "<%= @username %>" );
-$u->setEmail( "<%= @email %>" );
-$u->setEmailAuthenticationTimestamp( wfTimestamp() );
-$u->saveSettings();' |
-/usr/local/bin/mwscript eval.php --wiki=<%= @wiki %>
--
To view, visit https://gerrit.wikimedia.org/r/280800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d2cf288b6829a8680dad762d0e1b0bc21a36b09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
