Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322604
Change subject: Get rid of old beta_sites class now just containing a load of
ensure => absent
......................................................................
Get rid of old beta_sites class now just containing a load of ensure => absent
Bug: T1256
Change-Id: Ibdc60e5059223d694b5f9d06862f8f3c0d7cd3b4
---
D modules/mediawiki/manifests/web/beta_sites.pp
M modules/role/manifests/mediawiki/webserver.pp
2 files changed, 0 insertions(+), 77 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/322604/1
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
deleted file mode 100644
index 7cebfac..0000000
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ /dev/null
@@ -1,74 +0,0 @@
-class mediawiki::web::beta_sites {
- tag 'mediawiki', 'mw-apache-config'
-
- apache::site { 'main':
- ensure => absent,
- priority => 1,
- }
-
- apache::site { 'wikibooks':
- ensure => absent,
- priority => 2,
- }
-
- apache::site { 'wikipedia':
- ensure => absent,
- priority => 3,
- }
-
- apache::site { 'wikidata':
- ensure => absent,
- priority => 4,
- }
-
- apache::site { 'wikisource':
- ensure => absent,
- priority => 5,
- }
-
- apache::site { 'wikiversity':
- ensure => absent,
- priority => 7,
- }
-
- apache::site { 'wikiquote':
- ensure => absent,
- priority => 8,
- }
-
- apache::site { 'testwiki':
- ensure => absent,
- priority => 9,
- }
-
- apache::site { 'wiktionary':
- ensure => absent,
- priority => 10,
- }
-
- apache::site { 'wikinews':
- ensure => absent,
- priority => 11,
- }
-
- apache::site { 'loginwiki':
- ensure => absent,
- priority => 12,
- }
-
- apache::site { 'wikimedia':
- ensure => absent,
- priority => 16,
- }
-
- apache::site { 'wikivoyage':
- ensure => absent,
- priority => 17,
- }
-
- apache::site { 'remnant':
- ensure => absent,
- priority => 20,
- }
-
-}
diff --git a/modules/role/manifests/mediawiki/webserver.pp
b/modules/role/manifests/mediawiki/webserver.pp
index 39d7e18..1a46330 100644
--- a/modules/role/manifests/mediawiki/webserver.pp
+++ b/modules/role/manifests/mediawiki/webserver.pp
@@ -4,9 +4,6 @@
include ::mediawiki::web
include ::mediawiki::web::sites
include ::mediawiki::packages::fonts
- if $::realm == 'labs' {
- include ::mediawiki::web::beta_sites
- }
if hiera('has_lvs', true) {
include ::lvs::configuration
--
To view, visit https://gerrit.wikimedia.org/r/322604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdc60e5059223d694b5f9d06862f8f3c0d7cd3b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits