jenkins-bot has submitted this change and it was merged.
Change subject: Organize role assets
......................................................................
Organize role assets
Create subdirectories matching the role names to organize files and
templates for roles that use them.
Change-Id: I2c01f6c2debfb4c18c13a5ce0bfae9669e4dc352
---
R puppet/modules/role/files/sentry/VagrantRoleSentry.wiki
R puppet/modules/role/files/simple_performant/robots.txt
R puppet/modules/role/files/simple_performant/skins-htaccess
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/flow.pp
M puppet/modules/role/manifests/gadgets2.pp
M puppet/modules/role/manifests/gwtoolset.pp
M puppet/modules/role/manifests/memcached.pp
M puppet/modules/role/manifests/multimediaviewer.pp
M puppet/modules/role/manifests/private.pp
M puppet/modules/role/manifests/securepoll.pp
M puppet/modules/role/manifests/sentry.pp
M puppet/modules/role/manifests/simple_performant.pp
M puppet/modules/role/manifests/thumb_on_404.pp
M puppet/modules/role/manifests/thumb_on_404/multiwiki.pp
M puppet/modules/role/manifests/urlshortener.pp
M puppet/modules/role/manifests/visualeditor.pp
M puppet/modules/role/manifests/warnings_as_errors.pp
M puppet/modules/role/manifests/wikidata.pp
M puppet/modules/role/manifests/wikimediamessages.pp
R puppet/modules/role/templates/commons/foreign_repo.php.erb
R puppet/modules/role/templates/commons/images_folder.conf.erb
R puppet/modules/role/templates/flow/conf.php.erb
R puppet/modules/role/templates/gadgets2/foreign_repo.php.erb
R puppet/modules/role/templates/gwtoolset/conf.php.erb
R puppet/modules/role/templates/memcached/conf.php.erb
R puppet/modules/role/templates/multimediaviewer/apache2.conf.erb
R puppet/modules/role/templates/private/apache2.conf.erb
R puppet/modules/role/templates/private/local_repo.php.erb
R puppet/modules/role/templates/private/rights.php.erb
R puppet/modules/role/templates/securepoll/conf.php.erb
R puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
R puppet/modules/role/templates/urlshortener/apache2.conf.erb
R puppet/modules/role/templates/visualeditor/conf.php.erb
R puppet/modules/role/templates/warnings_as_errors/conf.php.erb
R puppet/modules/role/templates/wikidata/init.php.erb
R puppet/modules/role/templates/wikidata/shared.php.erb
R puppet/modules/role/templates/wikimediamessages/conf.php.erb
38 files changed, 22 insertions(+), 22 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
Mobrovac: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/puppet/modules/role/files/VagrantRoleSentry.wiki
b/puppet/modules/role/files/sentry/VagrantRoleSentry.wiki
similarity index 100%
rename from puppet/modules/role/files/VagrantRoleSentry.wiki
rename to puppet/modules/role/files/sentry/VagrantRoleSentry.wiki
diff --git a/puppet/modules/role/files/robots.txt
b/puppet/modules/role/files/simple_performant/robots.txt
similarity index 100%
rename from puppet/modules/role/files/robots.txt
rename to puppet/modules/role/files/simple_performant/robots.txt
diff --git a/puppet/modules/role/files/skins-htaccess
b/puppet/modules/role/files/simple_performant/skins-htaccess
similarity index 100%
rename from puppet/modules/role/files/skins-htaccess
rename to puppet/modules/role/files/simple_performant/skins-htaccess
diff --git a/puppet/modules/role/manifests/commons.pp
b/puppet/modules/role/manifests/commons.pp
index fe88a53..151f05a 100644
--- a/puppet/modules/role/manifests/commons.pp
+++ b/puppet/modules/role/manifests/commons.pp
@@ -20,12 +20,12 @@
}
mediawiki::settings { 'commons_ForeignRepo':
- values => template('role/commons_foreign_repo.php.erb'),
+ values => template('role/commons/foreign_repo.php.erb'),
}
apache::site_conf { 'custom_images_dir_for_commons':
site => $::mediawiki::wiki_name,
- content => template('role/commons_images_folder.conf.erb'),
+ content => template('role/commons/images_folder.conf.erb'),
require => Mediawiki::Wiki['commons'],
}
diff --git a/puppet/modules/role/manifests/flow.pp
b/puppet/modules/role/manifests/flow.pp
index a7ed002..ba577a2 100644
--- a/puppet/modules/role/manifests/flow.pp
+++ b/puppet/modules/role/manifests/flow.pp
@@ -7,7 +7,7 @@
mediawiki::extension { 'Flow':
needs_update => true,
- settings => template('role/flow-config.php.erb'),
+ settings => template('role/flow/conf.php.erb'),
priority => $::LOAD_LAST, # load *after* Mantle and Echo
}
}
diff --git a/puppet/modules/role/manifests/gadgets2.pp
b/puppet/modules/role/manifests/gadgets2.pp
index 5021471..db10374 100644
--- a/puppet/modules/role/manifests/gadgets2.pp
+++ b/puppet/modules/role/manifests/gadgets2.pp
@@ -20,7 +20,7 @@
mediawiki::wiki { 'gadgetsclient': }
mediawiki::settings { 'Gadgets_Foreign_Repo':
- values => template('role/gadget_foreign_repo.php.erb'),
+ values => template('role/gadgets2/foreign_repo.php.erb'),
wiki => 'gadgetsclient',
}
}
diff --git a/puppet/modules/role/manifests/gwtoolset.pp
b/puppet/modules/role/manifests/gwtoolset.pp
index 90ff845..1fdedd0 100644
--- a/puppet/modules/role/manifests/gwtoolset.pp
+++ b/puppet/modules/role/manifests/gwtoolset.pp
@@ -30,7 +30,7 @@
}
mediawiki::extension { 'GWToolset':
- settings => template('role/gwtoolset-config.php.erb')
+ settings => template('role/gwtoolset/conf.php.erb')
}
mediawiki::import_dump { 'mediawiki_common_css':
diff --git a/puppet/modules/role/manifests/memcached.pp
b/puppet/modules/role/manifests/memcached.pp
index 1cf4008..f3a78c5 100644
--- a/puppet/modules/role/manifests/memcached.pp
+++ b/puppet/modules/role/manifests/memcached.pp
@@ -6,7 +6,7 @@
include ::memcached::php
mediawiki::settings { 'Memcached':
- values => template('role/memcached.php.erb'),
+ values => template('role/memcached/conf.php.erb'),
}
}
diff --git a/puppet/modules/role/manifests/multimediaviewer.pp
b/puppet/modules/role/manifests/multimediaviewer.pp
index e053aa0..9a1df0f 100644
--- a/puppet/modules/role/manifests/multimediaviewer.pp
+++ b/puppet/modules/role/manifests/multimediaviewer.pp
@@ -12,7 +12,7 @@
apache::site_conf { 'Content-Disposition: attachment on ?download':
site => $mediawiki::wiki_name,
- content => template('role/content_disposition_attachment.conf.erb'),
+ content => template('role/multimediaviewer/apache2.conf.erb'),
}
mediawiki::import_dump { 'page_mediaviewere2etest':
diff --git a/puppet/modules/role/manifests/private.pp
b/puppet/modules/role/manifests/private.pp
index 7df203f..686f941 100644
--- a/puppet/modules/role/manifests/private.pp
+++ b/puppet/modules/role/manifests/private.pp
@@ -18,15 +18,15 @@
},
}
mediawiki::settings { 'private:repo':
- values => template('role/private_local_repo.php.erb'),
+ values => template('role/private/local_repo.php.erb'),
}
mediawiki::settings { 'private:rights':
- values => template('role/private_rights.php.erb'),
+ values => template('role/private/rights.php.erb'),
}
apache::site_conf { 'private_deny_images':
site => $::mediawiki::wiki_name,
- content => template('role/private_deny_images.conf.erb'),
+ content => template('role/private/apache2.conf.erb'),
require => Mediawiki::Wiki['private'],
}
diff --git a/puppet/modules/role/manifests/securepoll.pp
b/puppet/modules/role/manifests/securepoll.pp
index 99b3fdb..2e189ae 100644
--- a/puppet/modules/role/manifests/securepoll.pp
+++ b/puppet/modules/role/manifests/securepoll.pp
@@ -11,7 +11,7 @@
mediawiki::extension { 'SecurePoll':
needs_update => true,
- settings => template('role/securepoll.php.erb'),
+ settings => template('role/securepoll/conf.php.erb'),
}
mediawiki::wiki { 'vote': }
diff --git a/puppet/modules/role/manifests/sentry.pp
b/puppet/modules/role/manifests/sentry.pp
index d287deb..8d54012 100644
--- a/puppet/modules/role/manifests/sentry.pp
+++ b/puppet/modules/role/manifests/sentry.pp
@@ -21,6 +21,6 @@
mediawiki::extension { 'Buggy': }
mediawiki::import_text{ 'VagrantRoleSentry':
- source => 'puppet:///modules/role/VagrantRoleSentry.wiki',
+ source => 'puppet:///modules/role/sentry/VagrantRoleSentry.wiki',
}
}
diff --git a/puppet/modules/role/manifests/simple_performant.pp
b/puppet/modules/role/manifests/simple_performant.pp
index 655f9b0..ae8ab9f 100644
--- a/puppet/modules/role/manifests/simple_performant.pp
+++ b/puppet/modules/role/manifests/simple_performant.pp
@@ -63,12 +63,12 @@
file { '/var/www/robots.txt':
ensure => present,
mode => '0444',
- source => 'puppet:///modules/role/robots.txt',
+ source => 'puppet:///modules/role/simple_performant/robots.txt',
}
file { '/vagrant/mediawiki/skins/.htaccess':
ensure => present,
- source => 'puppet:///modules/role/skins-htaccess',
+ source => 'puppet:///modules/role/simple_performant/skins-htaccess',
require => Class['::apache::mod::expires'],
}
}
diff --git a/puppet/modules/role/manifests/thumb_on_404.pp
b/puppet/modules/role/manifests/thumb_on_404.pp
index 9970087..07f9407 100644
--- a/puppet/modules/role/manifests/thumb_on_404.pp
+++ b/puppet/modules/role/manifests/thumb_on_404.pp
@@ -19,6 +19,6 @@
$images_path = '/images'
apache::site_conf { 'thumb.php on 404':
site => $::mediawiki::wiki_name,
- content => template('role/thumb_on_404.conf.erb'),
+ content => template('role/thumb_on_404/apache2.conf.erb'),
}
}
diff --git a/puppet/modules/role/manifests/thumb_on_404/multiwiki.pp
b/puppet/modules/role/manifests/thumb_on_404/multiwiki.pp
index 16e85e1..7660e12 100644
--- a/puppet/modules/role/manifests/thumb_on_404/multiwiki.pp
+++ b/puppet/modules/role/manifests/thumb_on_404/multiwiki.pp
@@ -8,6 +8,6 @@
apache::site_conf { "${title}:thumb.php on 404":
site => $::mediawiki::wiki_name,
- content => template('role/thumb_on_404.conf.erb'),
+ content => template('role/thumb_on_404/apache2.conf.erb'),
}
}
diff --git a/puppet/modules/role/manifests/urlshortener.pp
b/puppet/modules/role/manifests/urlshortener.pp
index 0bb0e51..4fe8640 100644
--- a/puppet/modules/role/manifests/urlshortener.pp
+++ b/puppet/modules/role/manifests/urlshortener.pp
@@ -11,6 +11,6 @@
apache::site_conf { 'urlshortener_short_url_support':
site => $::mediawiki::wiki_name,
- content => template('role/urlshortener_shortening.conf.erb'),
+ content => template('role/urlshortener/apache2.conf.erb'),
}
}
diff --git a/puppet/modules/role/manifests/visualeditor.pp
b/puppet/modules/role/manifests/visualeditor.pp
index 5eef8a5..b058ed5 100644
--- a/puppet/modules/role/manifests/visualeditor.pp
+++ b/puppet/modules/role/manifests/visualeditor.pp
@@ -10,7 +10,7 @@
include ::role::uls
mediawiki::extension { 'VisualEditor':
- settings => template('role/ve-config.php.erb'),
+ settings => template('role/visualeditor/conf.php.erb'),
browser_tests => 'modules/ve-mw/tests/browser',
priority => $::LOAD_EARLY,
}
diff --git a/puppet/modules/role/manifests/warnings_as_errors.pp
b/puppet/modules/role/manifests/warnings_as_errors.pp
index f013d2b..d4e2307 100644
--- a/puppet/modules/role/manifests/warnings_as_errors.pp
+++ b/puppet/modules/role/manifests/warnings_as_errors.pp
@@ -2,6 +2,6 @@
# Turns all PHP warnings and notices into errors, useful for testing
class role::warnings_as_errors {
mediawiki::settings { 'warnings_as_errors':
- values => template( 'role/warnings_as_errors.php.erb' ),
+ values => template( 'role/warnings_as_errors/conf.php.erb' ),
}
}
diff --git a/puppet/modules/role/manifests/wikidata.pp
b/puppet/modules/role/manifests/wikidata.pp
index c9de9a8..8fe076c 100644
--- a/puppet/modules/role/manifests/wikidata.pp
+++ b/puppet/modules/role/manifests/wikidata.pp
@@ -15,12 +15,12 @@
entrypoint => 'Wikidata.php',
composer => true,
needs_update => true,
- settings => template('role/wikidata-shared.php.erb'),
+ settings => template('role/wikidata/shared.php.erb'),
}
mediawiki::settings { 'WikiData-Init':
priority => $::LOAD_EARLY,
- values => template('role/wikidata-init.php.erb'),
+ values => template('role/wikidata/init.php.erb'),
}
exec { 'wikidata-populate-site-tables':
diff --git a/puppet/modules/role/manifests/wikimediamessages.pp
b/puppet/modules/role/manifests/wikimediamessages.pp
index 905326d..a0e5cc2 100644
--- a/puppet/modules/role/manifests/wikimediamessages.pp
+++ b/puppet/modules/role/manifests/wikimediamessages.pp
@@ -6,6 +6,6 @@
# [1]https://www.mediawiki.org/wiki/Extension:WikimediaMessages
class role::wikimediamessages {
mediawiki::extension { 'WikimediaMessages':
- settings => template('role/wikimediamessages-config.php.erb')
+ settings => template('role/wikimediamessages/conf.php.erb')
}
}
diff --git a/puppet/modules/role/templates/commons_foreign_repo.php.erb
b/puppet/modules/role/templates/commons/foreign_repo.php.erb
similarity index 100%
rename from puppet/modules/role/templates/commons_foreign_repo.php.erb
rename to puppet/modules/role/templates/commons/foreign_repo.php.erb
diff --git a/puppet/modules/role/templates/commons_images_folder.conf.erb
b/puppet/modules/role/templates/commons/images_folder.conf.erb
similarity index 100%
rename from puppet/modules/role/templates/commons_images_folder.conf.erb
rename to puppet/modules/role/templates/commons/images_folder.conf.erb
diff --git a/puppet/modules/role/templates/flow-config.php.erb
b/puppet/modules/role/templates/flow/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/flow-config.php.erb
rename to puppet/modules/role/templates/flow/conf.php.erb
diff --git a/puppet/modules/role/templates/gadget_foreign_repo.php.erb
b/puppet/modules/role/templates/gadgets2/foreign_repo.php.erb
similarity index 100%
rename from puppet/modules/role/templates/gadget_foreign_repo.php.erb
rename to puppet/modules/role/templates/gadgets2/foreign_repo.php.erb
diff --git a/puppet/modules/role/templates/gwtoolset-config.php.erb
b/puppet/modules/role/templates/gwtoolset/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/gwtoolset-config.php.erb
rename to puppet/modules/role/templates/gwtoolset/conf.php.erb
diff --git a/puppet/modules/role/templates/memcached.php.erb
b/puppet/modules/role/templates/memcached/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/memcached.php.erb
rename to puppet/modules/role/templates/memcached/conf.php.erb
diff --git
a/puppet/modules/role/templates/content_disposition_attachment.conf.erb
b/puppet/modules/role/templates/multimediaviewer/apache2.conf.erb
similarity index 100%
rename from
puppet/modules/role/templates/content_disposition_attachment.conf.erb
rename to puppet/modules/role/templates/multimediaviewer/apache2.conf.erb
diff --git a/puppet/modules/role/templates/private_deny_images.conf.erb
b/puppet/modules/role/templates/private/apache2.conf.erb
similarity index 100%
rename from puppet/modules/role/templates/private_deny_images.conf.erb
rename to puppet/modules/role/templates/private/apache2.conf.erb
diff --git a/puppet/modules/role/templates/private_local_repo.php.erb
b/puppet/modules/role/templates/private/local_repo.php.erb
similarity index 100%
rename from puppet/modules/role/templates/private_local_repo.php.erb
rename to puppet/modules/role/templates/private/local_repo.php.erb
diff --git a/puppet/modules/role/templates/private_rights.php.erb
b/puppet/modules/role/templates/private/rights.php.erb
similarity index 100%
rename from puppet/modules/role/templates/private_rights.php.erb
rename to puppet/modules/role/templates/private/rights.php.erb
diff --git a/puppet/modules/role/templates/securepoll.php.erb
b/puppet/modules/role/templates/securepoll/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/securepoll.php.erb
rename to puppet/modules/role/templates/securepoll/conf.php.erb
diff --git a/puppet/modules/role/templates/thumb_on_404.conf.erb
b/puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
similarity index 100%
rename from puppet/modules/role/templates/thumb_on_404.conf.erb
rename to puppet/modules/role/templates/thumb_on_404/apache2.conf.erb
diff --git a/puppet/modules/role/templates/urlshortener_shortening.conf.erb
b/puppet/modules/role/templates/urlshortener/apache2.conf.erb
similarity index 100%
rename from puppet/modules/role/templates/urlshortener_shortening.conf.erb
rename to puppet/modules/role/templates/urlshortener/apache2.conf.erb
diff --git a/puppet/modules/role/templates/ve-config.php.erb
b/puppet/modules/role/templates/visualeditor/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/ve-config.php.erb
rename to puppet/modules/role/templates/visualeditor/conf.php.erb
diff --git a/puppet/modules/role/templates/warnings_as_errors.php.erb
b/puppet/modules/role/templates/warnings_as_errors/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/warnings_as_errors.php.erb
rename to puppet/modules/role/templates/warnings_as_errors/conf.php.erb
diff --git a/puppet/modules/role/templates/wikidata-init.php.erb
b/puppet/modules/role/templates/wikidata/init.php.erb
similarity index 100%
rename from puppet/modules/role/templates/wikidata-init.php.erb
rename to puppet/modules/role/templates/wikidata/init.php.erb
diff --git a/puppet/modules/role/templates/wikidata-shared.php.erb
b/puppet/modules/role/templates/wikidata/shared.php.erb
similarity index 100%
rename from puppet/modules/role/templates/wikidata-shared.php.erb
rename to puppet/modules/role/templates/wikidata/shared.php.erb
diff --git a/puppet/modules/role/templates/wikimediamessages-config.php.erb
b/puppet/modules/role/templates/wikimediamessages/conf.php.erb
similarity index 100%
rename from puppet/modules/role/templates/wikimediamessages-config.php.erb
rename to puppet/modules/role/templates/wikimediamessages/conf.php.erb
--
To view, visit https://gerrit.wikimedia.org/r/200502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2c01f6c2debfb4c18c13a5ce0bfae9669e4dc352
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
