Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/274613
Change subject: wikitech-apache: follow-up fix for labstestwiki config
......................................................................
wikitech-apache: follow-up fix for labstestwiki config
After moving the Wikitech Apache config in Ia25e7d551642c347e,
we need to also do this for labstestwiki config or it causes
a puppet error on labstestweb2001 etc.
Change-Id: Ib041825a8144061bf9887c3ae816b399ec293bdf
---
R modules/openstack/templates/common/labtestwikitech.wikimedia.org.erb
D modules/openstack/templates/liberty/labtestwikitech.wikimedia.org.erb
2 files changed, 0 insertions(+), 121 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/274613/1
diff --git a/modules/openstack/templates/kilo/labtestwikitech.wikimedia.org.erb
b/modules/openstack/templates/common/labtestwikitech.wikimedia.org.erb
similarity index 100%
rename from modules/openstack/templates/kilo/labtestwikitech.wikimedia.org.erb
rename to modules/openstack/templates/common/labtestwikitech.wikimedia.org.erb
diff --git
a/modules/openstack/templates/liberty/labtestwikitech.wikimedia.org.erb
b/modules/openstack/templates/liberty/labtestwikitech.wikimedia.org.erb
deleted file mode 100644
index ea21f45..0000000
--- a/modules/openstack/templates/liberty/labtestwikitech.wikimedia.org.erb
+++ /dev/null
@@ -1,121 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///templates/apache/sites/labtestwikitech.wikimedia.org
-#####################################################################
-# vim: filetype=apache
-
-<VirtualHost *:80>
- ServerAdmin n...@wikimedia.org
- ServerName <%= @webserver_hostname %>
- ServerAlias <%= @webserver_hostname_aliases %>
-
- DocumentRoot /srv/mediawiki/docroot/wikimedia.org
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /srv/mediawiki/docroot/wikimedia.org>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- <IfVersion < 2.4>
- Order allow,deny
- allow from all
- </IfVersion>
- </Directory>
-
- RewriteEngine on
- RewriteCond %{SERVER_PORT} !^443$
- RewriteRule ^/(.*)$ https://<%= @webserver_hostname %>/$1 [L,R]
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log wmf
- ServerSignature Off
-
-</VirtualHost>
-<VirtualHost *:443>
- ServerAdmin n...@wikimedia.org
- ServerName <%= @webserver_hostname %>
-
- SSLEngine on
- SSLCertificateFile /etc/ssl/localcerts/<%= @certificate %>.crt
- SSLCertificateChainFile /etc/ssl/localcerts/<%= @certificate %>.chain.crt
- SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
- <%= @ssl_settings.join("\n") %>
-
- RedirectMatch ^/$ https://<%= @webserver_hostname %>/wiki/
-
- RewriteEngine on
- RewriteRule ^/view/(.*)$ https://<%= @webserver_hostname %>/wiki/$1 [L,R]
- RewriteCond %{HTTP_HOST} !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %>
[NC]
- RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
-
- DocumentRoot /srv/mediawiki/docroot/wikimedia.org
- <Directory />
- Options FollowSymLinks
- AllowOverride None
- </Directory>
- <Directory /srv/mediawiki/docroot/wikimedia.org>
- Options Indexes FollowSymLinks MultiViews
- AllowOverride None
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- <IfVersion < 2.4>
- Order allow,deny
- allow from all
- </IfVersion>
- </Directory>
- <Directory /srv/org/wikimedia/controller/wikis/images>
- php_flag engine off
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
- </Directory>
- <Location /server-status>
- SetHandler server-status
- <IfVersion >= 2.4>
- Require host labtestwikitech.wikimedia.org
- </IfVersion>
- <IfVersion < 2.4>
- Order deny,allow
- Deny from all
- Allow from 208.80.153.14
- </IfVersion>
- </Location>
-
- Alias /w/images /srv/org/wikimedia/controller/wikis/images
- Alias /w /srv/mediawiki/docroot/wikimedia.org/w
- Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
- Alias /dumps /a/backup/public
- <% if @realm == "labs" %>
- # Add additional wikis for development
- Alias /w2 /srv/org/wikimedia/controller/wikis/w2
- Alias /wiki2 /srv/org/wikimedia/controller/wikis/w2/index.php
- Alias /w3 /srv/org/wikimedia/controller/wikis/w3
- Alias /wiki3 /srv/org/wikimedia/controller/wikis/w3/index.php
- <% end %>
-
- ErrorDocument 404 /w/404.php
-
- ErrorLog /var/log/apache2/error.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access.log wmf
- ServerSignature Off
-
- # Beacon requests that are normally handled by Varnish. We don't need these
- # requests to do anything, but they shouldn't show up in the JavaScript
- # error console as errors.
- RedirectMatch 204 beacon/(.*)$
-</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/274613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib041825a8144061bf9887c3ae816b399ec293bdf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
