Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185147
Change subject: Remove download::mediawiki
......................................................................
Remove download::mediawiki
Seemingly unused. Domain points to the main cluster now, with a
redirect.
Change-Id: I7030e67d505577c72224b9cc2e2599f55ee9d05c
---
M manifests/role/download.pp
D modules/download/manifests/mediawiki.pp
D modules/download/templates/download.mediawiki.org.erb
3 files changed, 0 insertions(+), 42 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/185147/1
diff --git a/manifests/role/download.pp b/manifests/role/download.pp
index 36c1a18..dbc4122 100644
--- a/manifests/role/download.pp
+++ b/manifests/role/download.pp
@@ -4,8 +4,3 @@
class role::download::wikimedia {
include ::download::wikimedia
}
-
-# download.mediawiki.org
-class role::download::mediawiki {
- include ::download::mediawiki
-}
diff --git a/modules/download/manifests/mediawiki.pp
b/modules/download/manifests/mediawiki.pp
deleted file mode 100644
index 86b7c08..0000000
--- a/modules/download/manifests/mediawiki.pp
+++ /dev/null
@@ -1,23 +0,0 @@
-class download::mediawiki {
-
- system::role { 'download::mediawiki': description => 'MediaWiki download' }
-
- apache::site { 'download.mediawiki.org':
- content => template('download/download.mediawiki.org.erb'),
- }
-
- file { '/srv/org/mediawiki':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0775',
- }
-
- file { '/srv/org/mediawiki/download':
- ensure => directory,
- owner => 'mwdeploy',
- group => 'mwdeploy',
- mode => '0775',
- }
-
-}
diff --git a/modules/download/templates/download.mediawiki.org.erb
b/modules/download/templates/download.mediawiki.org.erb
deleted file mode 100644
index 4a8b2ad..0000000
--- a/modules/download/templates/download.mediawiki.org.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///modules/download/apache/download.mediawiki.org
-#####################################################################
-# vim: filetype=apache
-
-<VirtualHost *:80>
- ServerName download.mediawiki.org
- DocumentRoot /srv/org/mediawiki/download
- <Directory /srv/org/mediawiki/download>
- Options +Indexes
- </Directory>
- php_admin_flag engine Off
-</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/185147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7030e67d505577c72224b9cc2e2599f55ee9d05c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
