jenkins-bot has submitted this change and it was merged.
Change subject: Remove all usage of virtual resources
......................................................................
Remove all usage of virtual resources
It dawned on me today that I had fundamentally misunderstood virtual resources,
and that their usage in MediaWiki-Vagrant was entirely voodoo.
What I got right:
- Virtual resources allow a resource to be declared in multiple places.
What I got wrong:
- You can include these multiple places without causing a duplicate definition
conflict.
- The resource should be declared in the same manner in all places.
Virtual resources are meant for when there are varying implementations of a
particular resource. Puppet still expects that only a single variant will be
declared for a given node.
This patch removes all usage of virtual resources from MediaWiki-Vagrant. There
should be no change in behavior / functionality.
Change-Id: I3313b394157a9daedf1bbe6e33e375c1603555db
---
M puppet/manifests/roles.pp
M puppet/modules/apache/manifests/init.pp
M puppet/modules/git/manifests/init.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/mediawiki/manifests/extension.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/php/manifests/init.pp
M puppet/modules/user_metrics/manifests/init.pp
M puppet/modules/xhprof/manifests/init.pp
10 files changed, 57 insertions(+), 66 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/manifests/roles.pp b/puppet/manifests/roles.pp
index 98062fc..454ad09 100644
--- a/puppet/manifests/roles.pp
+++ b/puppet/manifests/roles.pp
@@ -107,13 +107,13 @@
require => Exec['mediawiki setup'],
}
- @mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
+ mediawiki::extension { [ 'ContributionTracking', 'ParserFunctions' ]: }
- @mediawiki::extension { 'FundraisingEmailUnsubscribe':
+ mediawiki::extension { 'FundraisingEmailUnsubscribe':
entrypoint => 'FundraiserUnsubscribe.php',
}
- @mediawiki::extension { 'DonationInterface':
+ mediawiki::extension { 'DonationInterface':
entrypoint => 'donationinterface.php',
settings => template('fr-config.php.erb'),
needs_update => true,
@@ -137,7 +137,7 @@
include role::mediawiki
include role::geshi
- @mediawiki::extension { 'EventLogging':
+ mediawiki::extension { 'EventLogging':
priority => $LOAD_EARLY,
settings => {
wgEventLoggingBaseUri => 'http://localhost:8100/event.gif',
@@ -153,7 +153,7 @@
class role::oauth {
include role::mediawiki
- @mediawiki::extension { 'OAuth':
+ mediawiki::extension { 'OAuth':
needs_update => true,
settings => [
'$wgMWOAuthSecureTokenTransfer = false',
@@ -172,7 +172,7 @@
include role::mediawiki
include role::eventlogging
- @mediawiki::extension { 'MobileFrontend':
+ mediawiki::extension { 'MobileFrontend':
settings => {
wgMFForceSecureLogin => false,
wgMFLogEvents => true,
@@ -189,7 +189,7 @@
include role::mediawiki
include role::eventlogging
- @mediawiki::extension { 'GuidedTour': }
+ mediawiki::extension { 'GuidedTour': }
}
# == Class: role::gettingstarted
@@ -201,7 +201,7 @@
include role::eventlogging
include role::guidedtour
- @mediawiki::extension { 'GettingStarted':
+ mediawiki::extension { 'GettingStarted':
settings => {
wgGettingStartedRedis => '127.0.0.1',
},
@@ -214,14 +214,14 @@
include role::mediawiki
include role::eventlogging
- @mediawiki::extension { 'Echo':
+ mediawiki::extension { 'Echo':
needs_update => true,
settings => {
wgEchoEnableEmailBatch => false,
},
}
- @mediawiki::extension { 'Thanks':
+ mediawiki::extension { 'Thanks':
require => Mediawiki::Extension['Echo'],
}
}
@@ -233,7 +233,7 @@
include role::mediawiki
class { '::mediawiki::parsoid': }
- @mediawiki::extension { 'VisualEditor':
+ mediawiki::extension { 'VisualEditor':
settings => template('ve-config.php.erb'),
}
}
@@ -271,9 +271,9 @@
include packages::poster
include packages::wikitools
- @mediawiki::extension { 'Campaigns': }
+ mediawiki::extension { 'Campaigns': }
- @mediawiki::extension { 'UploadWizard':
+ mediawiki::extension { 'UploadWizard':
require => Package['imagemagick'],
settings => {
wgEnableUploads => true,
@@ -299,7 +299,7 @@
include role::mediawiki
include role::wikieditor
- @mediawiki::extension { 'CodeEditor': }
+ mediawiki::extension { 'CodeEditor': }
}
# == Class: role::geshi
@@ -307,7 +307,7 @@
class role::geshi {
include role::mediawiki
- @mediawiki::extension { 'SyntaxHighlight_GeSHi' : }
+ mediawiki::extension { 'SyntaxHighlight_GeSHi' : }
}
# == Class: role::scribunto
@@ -320,7 +320,7 @@
include packages::php_luasandbox
- @mediawiki::extension { 'Scribunto':
+ mediawiki::extension { 'Scribunto':
settings => {
wgScribuntoDefaultEngine => 'luasandbox',
wgScribuntoUseGeSHi => true,
@@ -339,7 +339,7 @@
# Configures WikiEditor, an extension which enable an extendable editing
# toolbar and interface
class role::wikieditor {
- @mediawiki::extension { 'WikiEditor':
+ mediawiki::extension { 'WikiEditor':
settings => [
'$wgDefaultUserOptions["usebetatoolbar"] = 1',
'$wgDefaultUserOptions["usebetatoolbar-cgd"] = 1',
@@ -355,7 +355,7 @@
class role::parserfunctions {
include role::mediawiki
- @mediawiki::extension { 'ParserFunctions': }
+ mediawiki::extension { 'ParserFunctions': }
}
# == Class: role::proofreadpage
@@ -376,11 +376,11 @@
},
}
- @mediawiki::extension { [ 'LabeledSectionTransclusion', 'Cite' ]:
+ mediawiki::extension { [ 'LabeledSectionTransclusion', 'Cite' ]:
before => Mediawiki::Extension['ProofreadPage'],
}
- @mediawiki::extension { 'ProofreadPage':
+ mediawiki::extension { 'ProofreadPage':
require => Package['djvulibre-bin', 'ghostscript', 'netpbm'],
needs_update => true,
settings => [
@@ -469,14 +469,14 @@
# Enable dynamic thumbnail generation via the thumb.php
# script for 404 thumb images.
- @mediawiki::settings { 'thumb.php on 404':
+ mediawiki::settings { 'thumb.php on 404':
values => {
wgThumbnailScriptPath => false,
wgGenerateThumbnailOnParse => false,
},
}
- @apache::conf { 'thumb.php on 404':
+ apache::conf { 'thumb.php on 404':
site => $mediawiki::wiki_name,
content => template('thumb_on_404.conf.erb'),
}
@@ -490,7 +490,7 @@
include role::echo
include role::parserfunctions
- @mediawiki::extension { 'EducationProgram':
+ mediawiki::extension { 'EducationProgram':
needs_update => true,
priority => $LOAD_LAST, # load *after* CLDR
}
@@ -501,7 +501,7 @@
class role::betafeatures {
include role::mediawiki
- @mediawiki::extension { 'BetaFeatures':
+ mediawiki::extension { 'BetaFeatures':
needs_update => true,
priority => $LOAD_EARLY,
}
@@ -521,7 +521,7 @@
include packages::poppler_utils
include packages::imagemagick
- @mediawiki::extension { 'PdfHandler':
+ mediawiki::extension { 'PdfHandler':
needs_update => true,
require => Package['ghostscript', 'imagemagick', 'poppler-utils'],
settings => [
@@ -542,7 +542,7 @@
include packages::mediawiki_math
include packages::ocaml_native_compilers
- @mediawiki::extension { 'Math':
+ mediawiki::extension { 'Math':
needs_update => true,
before => Exec['compile texvc'],
}
@@ -571,7 +571,7 @@
# Consortium to provide locale data in the XML format for use in computer
# applications.
class role::cldr {
- @mediawiki::extension { 'cldr':
+ mediawiki::extension { 'cldr':
priority => $LOAD_LATER,
}
}
@@ -587,23 +587,23 @@
include role::mediawiki
include role::cldr
- @mediawiki::extension { 'Babel':
+ mediawiki::extension { 'Babel':
require => Mediawiki::Extension['cldr'],
}
- @mediawiki::extension { 'LocalisationUpdate':
+ mediawiki::extension { 'LocalisationUpdate':
settings => {
wgLocalisationUpdateDirectory => '$IP/cache',
},
}
- @mediawiki::extension { 'CleanChanges':
+ mediawiki::extension { 'CleanChanges':
settings => [
'$wgDefaultUserOptions["usenewrc"] = 1',
],
}
- @mediawiki::extension { 'Translate':
+ mediawiki::extension { 'Translate':
needs_update => true,
settings => [
'$wgGroupPermissions["*"]["translate"] = true',
@@ -614,11 +614,11 @@
],
}
- @mediawiki::extension { 'Interwiki':
+ mediawiki::extension { 'Interwiki':
settings => [ '$wgGroupPermissions["sysop"]["interwiki"] = true' ],
}
- @mediawiki::extension { 'UniversalLanguageSelector':
+ mediawiki::extension { 'UniversalLanguageSelector':
settings => {
wgULSEnable => true,
},
@@ -631,11 +631,11 @@
class role::antispam {
include role::mediawiki
- @mediawiki::extension { 'AntiSpoof':
+ mediawiki::extension { 'AntiSpoof':
needs_update => true,
}
- @mediawiki::extension { 'AbuseFilter':
+ mediawiki::extension { 'AbuseFilter':
needs_update => true,
require => Mediawiki::Extension['AntiSpoof'],
settings => [
@@ -649,7 +649,7 @@
],
}
- @mediawiki::extension { 'SpamBlacklist':
+ mediawiki::extension { 'SpamBlacklist':
settings => {
wgLogSpamBlacklistHits => true,
},
@@ -664,9 +664,9 @@
class { '::elasticsearch': }
- @mediawiki::extension { 'Elastica': }
+ mediawiki::extension { 'Elastica': }
- @mediawiki::extension { 'CirrusSearch':
+ mediawiki::extension { 'CirrusSearch':
require => Service['elasticsearch'],
}
@@ -688,9 +688,9 @@
include role::echo
include role::mleb
- @mediawiki::extension { 'MassMessage': }
+ mediawiki::extension { 'MassMessage': }
- @mediawiki::extension { 'LiquidThreads':
+ mediawiki::extension { 'LiquidThreads':
needs_update => true,
settings => {
wgLqtTalkPages => false,
@@ -703,7 +703,7 @@
class role::apisandbox {
include role::mediawiki
- @mediawiki::extension { 'ApiSandbox': }
+ mediawiki::extension { 'ApiSandbox': }
}
# == Class: role::navigationtiming
@@ -713,7 +713,7 @@
include role::mediawiki
include role::eventlogging
- @mediawiki::extension { 'NavigationTiming': }
+ mediawiki::extension { 'NavigationTiming': }
}
# == Class: role::timedmediahandler
@@ -725,9 +725,9 @@
include packages::ffmpeg
include packages::ffmpeg2theora
- @mediawiki::extension { 'MwEmbedSupport': }
+ mediawiki::extension { 'MwEmbedSupport': }
- @mediawiki::extension { 'TimedMediaHandler':
+ mediawiki::extension { 'TimedMediaHandler':
needs_update => true,
require => [
Package[
@@ -747,7 +747,7 @@
include role::mediawiki
include role::multimedia
- @mediawiki::extension { 'CommonsMetadata': }
+ mediawiki::extension { 'CommonsMetadata': }
}
# == Class: role::multimediaviewer
@@ -758,7 +758,7 @@
include role::mediawiki
include role::multimedia
- @mediawiki::extension { 'MultimediaViewer': }
+ mediawiki::extension { 'MultimediaViewer': }
}
# == Class: role::hhvm
diff --git a/puppet/modules/apache/manifests/init.pp
b/puppet/modules/apache/manifests/init.pp
index 9c2115d..84a088c 100644
--- a/puppet/modules/apache/manifests/init.pp
+++ b/puppet/modules/apache/manifests/init.pp
@@ -35,8 +35,4 @@
require => Package['apache2'],
hasrestart => true,
}
-
- Apache::Mod <| |>
- Apache::Conf <| |>
- Apache::Site <| |>
}
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index 854845a..26c0ac3 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -30,6 +30,4 @@
ensure => '1.23',
provider => pip,
}
-
- Git::Clone <| |>
}
diff --git a/puppet/modules/mediawiki/manifests/apache.pp
b/puppet/modules/mediawiki/manifests/apache.pp
index 3499af5..5eb31cd 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -6,21 +6,21 @@
include ::mediawiki
include ::apache
- @apache::site { 'default':
+ apache::site { 'default':
ensure => absent,
}
- @apache::site { $mediawiki::wiki_name:
+ apache::site { $mediawiki::wiki_name:
ensure => present,
content => template('mediawiki/mediawiki-apache-site.erb'),
require => [ Apache::Mod['alias'], Apache::Mod['rewrite'] ],
}
- @apache::mod { 'alias':
+ apache::mod { 'alias':
ensure => present,
}
- @apache::mod { 'rewrite':
+ apache::mod { 'rewrite':
ensure => present,
}
diff --git a/puppet/modules/mediawiki/manifests/extension.pp
b/puppet/modules/mediawiki/manifests/extension.pp
index 03b36f1..b5572ab 100644
--- a/puppet/modules/mediawiki/manifests/extension.pp
+++ b/puppet/modules/mediawiki/manifests/extension.pp
@@ -87,13 +87,13 @@
) {
include mediawiki
- @git::clone { "mediawiki/extensions/${extension}":
+ git::clone { "mediawiki/extensions/${extension}":
directory => "${mediawiki::dir}/extensions/${extension}",
branch => $branch,
require => Git::Clone['mediawiki/core'],
}
- @mediawiki::settings { $extension:
+ mediawiki::settings { $extension:
ensure => $ensure,
header => sprintf('include_once "$IP/extensions/%s/%s";',
$extension, $entrypoint),
values => $settings,
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 2274965..b9030f5 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -72,7 +72,7 @@
server => $server_url,
}
- @git::clone { 'mediawiki/core':
+ git::clone { 'mediawiki/core':
directory => $dir,
branch => $branch,
}
@@ -155,7 +155,4 @@
command => "php ${dir}/maintenance/update.php --quick",
refreshonly => true,
}
-
- Mediawiki::Extension <| |>
- Mediawiki::Settings <| |>
}
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index 1b8ee77..29d5a3d 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -43,7 +43,7 @@
ensure => '0.8.2-1chl1~precise1',
}
- @git::clone { 'mediawiki/services/parsoid/deploy':
+ git::clone { 'mediawiki/services/parsoid/deploy':
directory => $dir,
require => Package['nodejs'],
}
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 6317058..ac980e3 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -23,7 +23,7 @@
ensure => present,
}
- @apache::mod { 'php5':
+ apache::mod { 'php5':
ensure => present,
}
diff --git a/puppet/modules/user_metrics/manifests/init.pp
b/puppet/modules/user_metrics/manifests/init.pp
index 75657f7..e841e0a 100644
--- a/puppet/modules/user_metrics/manifests/init.pp
+++ b/puppet/modules/user_metrics/manifests/init.pp
@@ -91,7 +91,7 @@
ensure => present,
}
- @apache::mod { 'wsgi':
+ apache::mod { 'wsgi':
require => Package['libapache2-mod-wsgi'],
}
diff --git a/puppet/modules/xhprof/manifests/init.pp
b/puppet/modules/xhprof/manifests/init.pp
index d185d04..e52e6ed 100644
--- a/puppet/modules/xhprof/manifests/init.pp
+++ b/puppet/modules/xhprof/manifests/init.pp
@@ -62,7 +62,7 @@
}
# Enable xhprof viewer on /xhprof directory of devwiki
- @apache::conf { 'xhprof':
+ apache::conf { 'xhprof':
ensure => present,
site => $role::mediawiki::wiki_name,
source => 'puppet:///modules/xhprof/xhprof-apache-config',
--
To view, visit https://gerrit.wikimedia.org/r/108223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3313b394157a9daedf1bbe6e33e375c1603555db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
