MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/155861
Change subject: Split dev roles out of MobileFrontend and CirrusSearch ...................................................................... Split dev roles out of MobileFrontend and CirrusSearch As discussed in [1], some extension roles have grown too large and are inconvenient when all you need is just to install an extension for testing or to satisfy a dependency. Thus, I'm splitting off some of the nastiest parts into *-dev roles that can be enabled by these extensions' developers without bothering the rest. Also, $wgMFForceSecureLogin is not used anymore ---- [1] http://article.gmane.org/gmane.science.linguistics.wikipedia.technical/78908 Change-Id: I8dd3ced3d38cdce2d82c310a5d36b3fe81104779 --- D puppet/modules/elasticsearch/templates/CirrusSearch.php.erb M puppet/modules/role/manifests/cirrussearch.pp A puppet/modules/role/manifests/cirrussearch_dev.pp M puppet/modules/role/manifests/mobilefrontend.pp 4 files changed, 16 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/61/155861/1 diff --git a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb b/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb deleted file mode 100644 index 7f48a9d..0000000 --- a/puppet/modules/elasticsearch/templates/CirrusSearch.php.erb +++ /dev/null @@ -1,2 +0,0 @@ -$wgRedisPassword = ''; -include_once "$IP/extensions/CirrusSearch/tests/jenkins/Jenkins.php"; diff --git a/puppet/modules/role/manifests/cirrussearch.pp b/puppet/modules/role/manifests/cirrussearch.pp index 95f2c87..0018f1c 100644 --- a/puppet/modules/role/manifests/cirrussearch.pp +++ b/puppet/modules/role/manifests/cirrussearch.pp @@ -2,9 +2,6 @@ # The CirrusSearch extension implements searching for MediaWiki using # Elasticsearch. class role::cirrussearch { - include ::role::timedmediahandler - include ::role::pdfhandler - include ::role::cite include ::elasticsearch require_package('jq') @@ -42,7 +39,9 @@ mediawiki::extension { 'Elastica': } mediawiki::extension { 'CirrusSearch': - settings => template('elasticsearch/CirrusSearch.php.erb'), + settings => { + wgRedisPassword => '', + }, require => Service['elasticsearch'], } diff --git a/puppet/modules/role/manifests/cirrussearch_dev.pp b/puppet/modules/role/manifests/cirrussearch_dev.pp new file mode 100644 index 0000000..782571c --- /dev/null +++ b/puppet/modules/role/manifests/cirrussearch_dev.pp @@ -0,0 +1,13 @@ +# == Class: role::cirrussearch_dev +# Configures developer dependencies for CIrrusSearch: optional extensions +# and browser tests. +class role::cirrussearch_dev { + include role::cirrussearch + include ::role::timedmediahandler + include ::role::pdfhandler + include ::role::cite + + mediawiki::settings{ 'CirrusSearch-dev': + values => 'include_once "$IP/extensions/CirrusSearch/tests/jenkins/Jenkins.php";', + } +} \ No newline at end of file diff --git a/puppet/modules/role/manifests/mobilefrontend.pp b/puppet/modules/role/manifests/mobilefrontend.pp index 6b2f075..2eae30c 100644 --- a/puppet/modules/role/manifests/mobilefrontend.pp +++ b/puppet/modules/role/manifests/mobilefrontend.pp @@ -8,29 +8,11 @@ # class role::mobilefrontend { require ::role::mediawiki - include ::role::eventlogging include ::role::mantle - include ::role::pageimages - include ::role::textextracts mediawiki::extension { 'MobileFrontend': settings => { - wgMFForceSecureLogin => false, - wgMFLogEvents => true, wgMFAutodetectMobileView => true, - wgMFNearby => true, }, - browser_tests => true, - } - - mediawiki::wiki{ 'mobile': } - - mediawiki::settings { 'AlwaysMobileSkin': - wiki => 'mobile', - values => { - wgMFAutodetectMobileView => false, - wgMFMobileHeader => 'Host', - wgMobileUrlTemplate => "mobile${::mediawiki::multiwiki::base_domain}", - } } } -- To view, visit https://gerrit.wikimedia.org/r/155861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8dd3ced3d38cdce2d82c310a5d36b3fe81104779 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: MaxSem <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
