Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322603
Change subject: Use production apache config on beta
......................................................................
Use production apache config on beta
Bug: T1256
Change-Id: I5b05b096d08d8829ddc5837518b4f35719a514dd
---
M modules/mediawiki/manifests/web/beta_sites.pp
D modules/mediawiki/manifests/web/prod_sites.pp
M modules/mediawiki/manifests/web/sites.pp
M modules/mediawiki/templates/apache/sites/main.conf.erb
M modules/mediawiki/templates/apache/sites/remnant.conf.erb
M modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
M modules/role/manifests/mediawiki/webserver.pp
7 files changed, 80 insertions(+), 88 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/03/322603/1
diff --git a/modules/mediawiki/manifests/web/beta_sites.pp
b/modules/mediawiki/manifests/web/beta_sites.pp
index 9cbfd5e..7cebfac 100644
--- a/modules/mediawiki/manifests/web/beta_sites.pp
+++ b/modules/mediawiki/manifests/web/beta_sites.pp
@@ -1,49 +1,38 @@
class mediawiki::web::beta_sites {
tag 'mediawiki', 'mw-apache-config'
- apache::mod_conf { 'php5':
- ensure => 'absent',
- }
-
- # w-beta.wmflabs.org depends on proxy_http
- include ::apache::mod::proxy_http
- apache::site { 'beta-specific':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/beta_specific.conf',
- priority => 1,
- }
-
apache::site { 'main':
- source => 'puppet:///modules/mediawiki/apache/beta/sites/main.conf',
+ ensure => absent,
priority => 1,
}
apache::site { 'wikibooks':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikibooks.conf',
+ ensure => absent,
priority => 2,
}
apache::site { 'wikipedia':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikipedia.conf',
+ ensure => absent,
priority => 3,
}
apache::site { 'wikidata':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikidata.conf',
+ ensure => absent,
priority => 4,
}
apache::site { 'wikisource':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikisource.conf',
+ ensure => absent,
priority => 5,
}
apache::site { 'wikiversity':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikiversity.conf',
+ ensure => absent,
priority => 7,
}
apache::site { 'wikiquote':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikiquote.conf',
+ ensure => absent,
priority => 8,
}
@@ -53,32 +42,32 @@
}
apache::site { 'wiktionary':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wiktionary.conf',
+ ensure => absent,
priority => 10,
}
apache::site { 'wikinews':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikinews.conf',
+ ensure => absent,
priority => 11,
}
apache::site { 'loginwiki':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/loginwiki.conf',
+ ensure => absent,
priority => 12,
}
apache::site { 'wikimedia':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikimedia.conf',
+ ensure => absent,
priority => 16,
}
apache::site { 'wikivoyage':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/wikivoyage.conf',
+ ensure => absent,
priority => 17,
}
apache::site { 'remnant':
- source =>
'puppet:///modules/mediawiki/apache/beta/sites/remnant.conf',
+ ensure => absent,
priority => 20,
}
diff --git a/modules/mediawiki/manifests/web/prod_sites.pp
b/modules/mediawiki/manifests/web/prod_sites.pp
deleted file mode 100644
index db71450..0000000
--- a/modules/mediawiki/manifests/web/prod_sites.pp
+++ /dev/null
@@ -1,43 +0,0 @@
-class mediawiki::web::prod_sites {
- tag 'mediawiki', 'mw-apache-config'
-
- apache::site { 'redirects':
- source => 'puppet:///mediawiki/apache/sites/redirects.conf',
- priority => 2,
- }
-
- apache::site { 'main':
- content => template('mediawiki/apache/sites/main.conf.erb'),
- priority => 3,
- }
-
- apache::site { 'remnant':
- content => template('mediawiki/apache/sites/remnant.conf.erb'),
- priority => 4,
- }
-
- apache::site { 'search.wikimedia':
- source => 'puppet:///mediawiki/apache/sites/search.wikimedia.conf',
- priority => 5,
- }
-
- apache::site { 'secure.wikimedia':
- source => 'puppet:///mediawiki/apache/sites/secure.wikimedia.conf',
- priority => 6,
- }
-
- apache::site { 'wikimania':
- content => template('mediawiki/apache/sites/wikimania.conf.erb'),
- priority => 7,
- }
-
- apache::site { 'wikimedia':
- content => template('mediawiki/apache/sites/wikimedia.conf.erb'),
- priority => 8,
- }
-
- apache::site { 'foundation':
- source => 'puppet:///mediawiki/apache/sites/foundation.conf',
- priority => 9,
- }
-}
diff --git a/modules/mediawiki/manifests/web/sites.pp
b/modules/mediawiki/manifests/web/sites.pp
index 92d7a07..8170cb4 100644
--- a/modules/mediawiki/manifests/web/sites.pp
+++ b/modules/mediawiki/manifests/web/sites.pp
@@ -40,9 +40,58 @@
priority => 0,
}
+ if $::realm == 'labs' {
+ # w-beta.wmflabs.org depends on proxy_http
+ include ::apache::mod::proxy_http
+ apache::site { 'beta-specific':
+ source =>
'puppet:///modules/mediawiki/apache/beta/sites/beta_specific.conf',
+ priority => 1,
+ }
+ }
+
$rewrite_portal = $portal_dir != 'portal'
apache::site { 'wwwportals':
content => template('mediawiki/apache/sites/wwwportals.conf.erb'),
priority => 1,
}
+
+ apache::site { 'redirects':
+ source => 'puppet:///mediawiki/apache/sites/redirects.conf',
+ priority => 2,
+ }
+
+ apache::site { 'main':
+ content => template('mediawiki/apache/sites/main.conf.erb'),
+ priority => 3,
+ }
+
+ apache::site { 'remnant':
+ content => template('mediawiki/apache/sites/remnant.conf.erb'),
+ priority => 4,
+ }
+
+ apache::site { 'search.wikimedia':
+ source => 'puppet:///mediawiki/apache/sites/search.wikimedia.conf',
+ priority => 5,
+ }
+
+ apache::site { 'secure.wikimedia':
+ source => 'puppet:///mediawiki/apache/sites/secure.wikimedia.conf',
+ priority => 6,
+ }
+
+ apache::site { 'wikimania':
+ content => template('mediawiki/apache/sites/wikimania.conf.erb'),
+ priority => 7,
+ }
+
+ apache::site { 'wikimedia':
+ content => template('mediawiki/apache/sites/wikimedia.conf.erb'),
+ priority => 8,
+ }
+
+ apache::site { 'foundation':
+ source => 'puppet:///mediawiki/apache/sites/foundation.conf',
+ priority => 9,
+ }
}
diff --git a/modules/mediawiki/templates/apache/sites/main.conf.erb
b/modules/mediawiki/templates/apache/sites/main.conf.erb
index 1606688..ca71e1b 100644
--- a/modules/mediawiki/templates/apache/sites/main.conf.erb
+++ b/modules/mediawiki/templates/apache/sites/main.conf.erb
@@ -74,8 +74,8 @@
# Wikidata
<VirtualHost *:80>
- ServerName www.wikidata.org
- ServerAlias *.wikidata.org
+ ServerName www.wikidata.<%= @domain_suffix %>
+ ServerAlias *.wikidata.<%= @domain_suffix %>
DocumentRoot "/srv/mediawiki/docroot/wikidata"
@@ -104,7 +104,7 @@
# Wiktionaries
<VirtualHost *:80>
ServerName wiktionary
- ServerAlias *.wiktionary.org
+ ServerAlias *.wiktionary.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wiktionary.org"
@@ -163,7 +163,7 @@
# Wikiquotes
<VirtualHost *:80>
ServerName wikiquote
- ServerAlias *.wikiquote.org
+ ServerAlias *.wikiquote.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikiquote.org"
@@ -259,7 +259,7 @@
# Wikipedias
<VirtualHost *:80>
ServerName wikipedia
- ServerAlias *.wikipedia.org
+ ServerAlias *.wikipedia.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikipedia.org"
@@ -327,7 +327,7 @@
# Wikibooks
<VirtualHost *:80>
ServerName wikibooks
- ServerAlias *.wikibooks.org
+ ServerAlias *.wikibooks.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikibooks.org"
@@ -387,7 +387,7 @@
# Wikisource (note: approved languages only)
<VirtualHost *:80>
ServerName wikisource
- ServerAlias *.wikisource.org
+ ServerAlias *.wikisource.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikisource.org"
@@ -447,7 +447,7 @@
# Wikinews (approved subdomains only)
<VirtualHost *:80>
ServerName wikinews
- ServerAlias *.wikinews.org
+ ServerAlias *.wikinews.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikinews.org"
@@ -508,7 +508,7 @@
# Wikiversity (note: approved languages only)
<VirtualHost *:80>
ServerName wikiversity
- ServerAlias *.wikiversity.org
+ ServerAlias *.wikiversity.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikiversity.org"
@@ -568,7 +568,7 @@
# Wikivoyage
<VirtualHost *:80>
ServerName wikivoyage
- ServerAlias *.wikivoyage.org
+ ServerAlias *.wikivoyage.<%= @domain_suffix %>
UseCanonicalName off
DocumentRoot "/srv/mediawiki/docroot/wikivoyage.org"
diff --git a/modules/mediawiki/templates/apache/sites/remnant.conf.erb
b/modules/mediawiki/templates/apache/sites/remnant.conf.erb
index 30bd128..fa5dfae 100644
--- a/modules/mediawiki/templates/apache/sites/remnant.conf.erb
+++ b/modules/mediawiki/templates/apache/sites/remnant.conf.erb
@@ -1,6 +1,6 @@
# Meta
<VirtualHost *:80>
- ServerName meta.wikimedia.org
+ ServerName meta.wikimedia.<%= @domain_suffix %>
RewriteEngine On
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
RewriteCond %{ENV:RW_PROTO} !=https
@@ -22,7 +22,7 @@
# Wikisource
<VirtualHost *:80>
DocumentRoot "/srv/mediawiki/docroot/wikisource.org"
- ServerName wikisource.org
+ ServerName wikisource.<%= @domain_suffix %>
AllowEncodedSlashes On
@@ -58,7 +58,7 @@
# Wikimedia Commons
<VirtualHost *:80>
DocumentRoot "/srv/mediawiki/docroot/commons"
- ServerName commons.wikimedia.org
+ ServerName commons.wikimedia.<%= @domain_suffix %>
AllowEncodedSlashes On
diff --git a/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
b/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
index 2df1f70..f135854 100644
--- a/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
+++ b/modules/mediawiki/templates/apache/sites/wikimedia.conf.erb
@@ -46,7 +46,7 @@
# loginwiki
<VirtualHost *:80>
- ServerName login.wikimedia.org
+ ServerName login.wikimedia.<%= @domain_suffix %>
Include "sites-enabled/wikimedia-common.incl"
</VirtualHost>
@@ -84,10 +84,10 @@
# zerowiki T83475
<VirtualHost *:80>
- ServerName zero.wikimedia.org
+ ServerName zero.wikimedia.<%= @domain_suffix %>
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
- RewriteRule ^/(.*)$ https://zero.wikimedia.org/$1 [R=301,L,NE]
+ RewriteRule ^/(.*)$ https://zero.wikimedia.<%= @domain_suffix %>/$1
[R=301,L,NE]
Include "sites-enabled/wikimedia-common.incl"
</VirtualHost>
@@ -95,8 +95,8 @@
<VirtualHost *:80>
DocumentRoot "/srv/mediawiki/docroot/wwwportal"
# bare wikimedia.org is in redirects.dat
- ServerName www.wikimedia.org
- ServerAlias *.wikimedia.org # FIXME: Should this still be here?
+ ServerName www.wikimedia.<%= @domain_suffix %>
+ ServerAlias *.wikimedia.<%= @domain_suffix %> # FIXME: Should this still
be here?
RewriteEngine On
RewriteRule . - [E=RW_PROTO:%{HTTP:X-Forwarded-Proto}]
diff --git a/modules/role/manifests/mediawiki/webserver.pp
b/modules/role/manifests/mediawiki/webserver.pp
index 857d4e6..39d7e18 100644
--- a/modules/role/manifests/mediawiki/webserver.pp
+++ b/modules/role/manifests/mediawiki/webserver.pp
@@ -4,11 +4,8 @@
include ::mediawiki::web
include ::mediawiki::web::sites
include ::mediawiki::packages::fonts
- # FIXME: These should all be merged into the generic sites class!
if $::realm == 'labs' {
include ::mediawiki::web::beta_sites
- } else {
- include ::mediawiki::web::prod_sites
}
if hiera('has_lvs', true) {
--
To view, visit https://gerrit.wikimedia.org/r/322603
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b05b096d08d8829ddc5837518b4f35719a514dd
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
