Jcrespo has submitted this change and it was merged.
Change subject: Add public-wiki-rewrites to wikitech
......................................................................
Add public-wiki-rewrites to wikitech
Bug: T99096
Change-Id: Ie30064c67e232c11b6b98ef1292fcbd21fcfeaa6
---
M modules/openstack/manifests/openstack_manager.pp
M modules/openstack/templates/common/wikitech.wikimedia.org.erb
2 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jcrespo: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/openstack_manager.pp
b/modules/openstack/manifests/openstack_manager.pp
index 11457c8..81e8913 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -53,11 +53,15 @@
}
}
+ file { '/etc/apache2/sites-enabled/public-wiki-rewrites.incl':
+ ensure => present,
+ source =>
'puppet:///modules/mediawiki/apache/sites/public-wiki-rewrites.incl',
+ before => Service['apache2'],
+ }
$webserver_ip = $webserver_hostname ? {
'wikitech.wikimedia.org' => '208.80.154.136',
'labtestwikitech.wikimedia.org' => '208.80.153.14'
}
-
apache::site { $webserver_hostname:
content => template('openstack/common/wikitech.wikimedia.org.erb'),
}
diff --git a/modules/openstack/templates/common/wikitech.wikimedia.org.erb
b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
index fcccc40..6a7b73c 100644
--- a/modules/openstack/templates/common/wikitech.wikimedia.org.erb
+++ b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
@@ -30,6 +30,8 @@
RewriteCond %{SERVER_PORT} !^443$
RewriteRule ^/(.*)$ https://<%= @webserver_hostname %>/$1 [L,R]
+ Include "sites-enabled/public-wiki-rewrites.incl"
+
ErrorLog /var/log/apache2/error.log
# Possible values include: debug, info, notice, warn, error, crit,
@@ -57,6 +59,8 @@
RewriteCond %{HTTP_HOST} !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %>
[NC]
RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
+ Include "sites-enabled/public-wiki-rewrites.incl"
+
DocumentRoot /srv/mediawiki/docroot/wikimedia.org
<Directory />
Options FollowSymLinks
--
To view, visit https://gerrit.wikimedia.org/r/273410
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie30064c67e232c11b6b98ef1292fcbd21fcfeaa6
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
