BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/276799
Change subject: Fix ordering in role:echo
......................................................................
Fix ordering in role:echo
The database patch cannot be applied before the extension is
provisioned.
Change-Id: I23030d395245458072ae3d6480576465d4828ee2
---
M puppet/modules/role/manifests/echo.pp
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/99/276799/1
diff --git a/puppet/modules/role/manifests/echo.pp
b/puppet/modules/role/manifests/echo.pp
index 2efe037..ad1618f 100644
--- a/puppet/modules/role/manifests/echo.pp
+++ b/puppet/modules/role/manifests/echo.pp
@@ -24,7 +24,10 @@
mysql::sql { 'create echo_unread_wikis':
sql => "USE ${shared_tracking_db}; SOURCE
${echo_dir}/db_patches/echo_unread_wikis.sql;",
unless => "SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE
TABLE_SCHEMA='${shared_tracking_db}' AND TABLE_NAME = 'echo_unread_wikis'",
- require => Mysql::Db[$shared_tracking_db],
+ require => [
+ Mysql::Db[$shared_tracking_db],
+ Mediawiki::Extension['Echo'],
+ ],
notify => Mediawiki::Maintenance['backfill echo_unread_wikis'],
}
@@ -45,7 +48,6 @@
wgAllowHTMLEmail => true,
wgEchoUseCrossWikiBetaFeature => true,
},
- require => Mysql::Sql['create echo_unread_wikis'],
}
mediawiki::wiki { 'fr': }
--
To view, visit https://gerrit.wikimedia.org/r/276799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23030d395245458072ae3d6480576465d4828ee2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
