Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322418
Change subject: beta: Use wikimedia-common.incl for testwiki
......................................................................
beta: Use wikimedia-common.incl for testwiki
Change-Id: Ida30d060b2739895bffcd24ae71f97e22cdef92f
---
D modules/mediawiki/files/apache/beta/sites/testwiki.conf
M modules/mediawiki/files/apache/beta/sites/wikimedia.conf
M modules/mediawiki/manifests/web/beta_sites.pp
3 files changed, 5 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/322418/1
diff --git a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
b/modules/mediawiki/files/apache/beta/sites/testwiki.conf
deleted file mode 100644
index 112cdfe..0000000
--- a/modules/mediawiki/files/apache/beta/sites/testwiki.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-<VirtualHost *:80>
- ServerName testwikimedia
- ServerAlias test.wikimedia.beta.wmflabs.org
- UseCanonicalName off
- DocumentRoot "/srv/mediawiki/docroot/wikimedia.org"
-
- AllowEncodedSlashes On
- RewriteEngine On
-
- ProxyPass /wiki
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php retry=0
- ProxyPass /w/extensions !
- ProxyPassMatch ^/w/(.*\.(php|hh))$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/$1
- RewriteRule ^/$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/index.php [P]
- RewriteRule ^/robots\.txt$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/robots.php [P]
- RewriteRule ^/favicon\.ico$
fcgi://127.0.0.1:9000/srv/mediawiki/docroot/wikimedia.org/w/favicon.php [P]
-
- # Primary wiki redirector
- Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- Include "sites-enabled/public-wiki-rewrites.incl"
-</VirtualHost>
diff --git a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
index b044345..9147da7 100644
--- a/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
+++ b/modules/mediawiki/files/apache/beta/sites/wikimedia.conf
@@ -10,3 +10,8 @@
RewriteRule ^/(.*)$ https://zero.wikimedia.beta.wmflabs.org/$1 [R=301,L,NE]
Include "sites-enabled/wikimedia-common.incl"
</VirtualHost>
+
+<VirtualHost *:80>
+ ServerName test.wikimedia.beta.wmflabs.org
+ Include "sites-enabled/wikimedia-common.incl"
+</VirtualHost>
\ No newline at end of file
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
index c2a031f..6b27985 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -42,11 +42,6 @@
priority => 8,
}
- apache::site { 'testwiki':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/testwiki.conf',
- priority => 9,
- }
-
apache::site { 'wiktionary':
source =>
'puppet:///modules/mediawiki/apache/beta/sites/wiktionary.conf',
priority => 10,
--
To view, visit https://gerrit.wikimedia.org/r/322418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida30d060b2739895bffcd24ae71f97e22cdef92f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
