BryanDavis has uploaded a new change for review. https://gerrit.wikimedia.org/r/155465
Change subject: Require mediawiki::multiverison in ::mediawiki ...................................................................... Require mediawiki::multiverison in ::mediawiki Attempt to ensure that the configuration scripts created by mediawiki::multiverison are in place before any attempted execution of MediaWiki code by requiring rather than just including mediawiki::multiverison. Bug: 69816 Change-Id: I5b8d8516bfe6ba216fae219663c72a4ff8e265be --- M puppet/modules/mediawiki/manifests/init.pp 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/65/155465/1 diff --git a/puppet/modules/mediawiki/manifests/init.pp b/puppet/modules/mediawiki/manifests/init.pp index 41675c0..733cb12 100644 --- a/puppet/modules/mediawiki/manifests/init.pp +++ b/puppet/modules/mediawiki/manifests/init.pp @@ -23,9 +23,6 @@ # [*db_pass*] # Password for MySQL account (example: 'secret123'). # -# [*branch*] -# Version to check out -# # [*dir*] # The system path to which MediaWiki files have been installed # (example: '/srv/mediawiki'). @@ -41,6 +38,9 @@ # [*upload_dir*] # The file system path of the folder where files will be uploaded # (example: '/srv/mediawiki/images'). +# +# [*branch*] +# Version to check out # # [*server_url*] # Full base URL of host (example: 'http://mywiki.net:8080'). @@ -68,7 +68,7 @@ include mediawiki::apache include mediawiki::jobrunner - include mediawiki::multiwiki + require mediawiki::multiwiki $managed_settings_dir = "${settings_dir}/puppet-managed" -- To view, visit https://gerrit.wikimedia.org/r/155465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b8d8516bfe6ba216fae219663c72a4ff8e265be 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
