Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/273410
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/kilo/wikitech.wikimedia.org.erb
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/273410/1
diff --git a/modules/openstack/manifests/openstack_manager.pp
b/modules/openstack/manifests/openstack_manager.pp
index 534a0f9..80ae716 100644
--- a/modules/openstack/manifests/openstack_manager.pp
+++ b/modules/openstack/manifests/openstack_manager.pp
@@ -53,6 +53,12 @@
}
}
+ file { '/etc/apache2/sites-enabled/public-wiki-rewrites.incl':
+ ensure => present,
+ source =>
'puppet:///modules/mediawiki/apache/sites/public-wiki-rewrites.incl',
+ before => Service['apache2'],
+ }
+
apache::site { $webserver_hostname:
content =>
template("openstack/${$openstack_version}/${webserver_hostname}.erb"),
}
diff --git a/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
b/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
index 6bd747c..2ef06d0 100644
--- a/modules/openstack/templates/kilo/wikitech.wikimedia.org.erb
+++ b/modules/openstack/templates/kilo/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: newchange
Gerrit-Change-Id: Ie30064c67e232c11b6b98ef1292fcbd21fcfeaa6
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
