Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350494 )
Change subject: dynamicproxy: Make use of errorpage template
......................................................................
dynamicproxy: Make use of errorpage template
Re-use the errorpage template used by Varnish.
This also fixes toollabs proxy, since it uses dynamicproxy.
Changes to template:
* Make logo_link configurable and optional.
* Make logo_src and logo_srcset configurable. (required)
* Make logo_srcset and logo_alt configurable. (required)
* Add favicon optional parameter.
Bug: T113114
Change-Id: I764d00c7b40ad0931590f04ed2f76ecbd84b33ba
---
M modules/dynamicproxy/manifests/init.pp
D modules/dynamicproxy/templates/errorpage.erb
M modules/mediawiki/templates/errorpage.html.erb
M modules/varnish/manifests/common/vcl.pp
4 files changed, 16 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/94/350494/1
diff --git a/modules/dynamicproxy/manifests/init.pp
b/modules/dynamicproxy/manifests/init.pp
index 09c4ae6..8b930fd 100644
--- a/modules/dynamicproxy/manifests/init.pp
+++ b/modules/dynamicproxy/manifests/init.pp
@@ -26,7 +26,7 @@
logo => '/.error/labs-logo.png',
logo_2x => '/.error/labs-logo-2x.png',
logo_alt => 'Wikimedia Labs',
- favicon => '//wikitech.wikimedia.org/static/favicon/wikitech.ico',
+ favicon =>
'https://wikitech.wikimedia.org/static/favicon/wikitech.ico',
},
$error_description = 'Our servers are currently experiencing a
technical problem. This is probably temporary and should be fixed soon. Please
try again later.',
$error_details = undef,
@@ -105,10 +105,18 @@
mode => '0444',
}
-
+ $errorpage = {
+ favicon => $error_config['favicon'],
+ title => $error_config['title'],
+ logo_src => $error_config['logo'],
+ logo_srcset => "$error_config['logo_2x'] 2x",
+ logo_alt => $error_config['logo_alt'],
+ content => "<p>$error_description</p>",
+ footer => $error_details,
+ }
file { '/var/www/error/errorpage.html':
ensure => file,
- content => template('dynamicproxy/errorpage.erb'),
+ source => template('mediawiki/errorpage.html.erb'),
owner => 'www-data',
group => 'www-data',
mode => '0444',
diff --git a/modules/dynamicproxy/templates/errorpage.erb
b/modules/dynamicproxy/templates/errorpage.erb
deleted file mode 100644
index ae0349a..0000000
--- a/modules/dynamicproxy/templates/errorpage.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang=en>
-<link rel="shortcut icon" href="<%= @error_config['favicon'] %>" />
-<title><%= @error_config['title'] %></title>
-<style>
-* { margin: 0; padding: 0; }
-body { background: #fff; font: 14px/1.6 sans-serif; color: #333; }
-.content { margin: 7% auto 0; padding: 2em 1em 1em; max-width: 560px; }
-.footer { clear: both; margin-top: 14%; border-top: 1px solid #e5e5e5;
padding: 2em 0; background: #f9f9f9; font-size: 0.8em; text-align: center; }
-img { float: left; margin: 0 2em 2em 0; }
-a img { border: 0; }
-h1 { margin-top: 1em; font-size: 1.2em; }
-p { margin: 0.7em 0 1em 0; }
-a { color: #0645AD; text-decoration: none; }
-a:hover { text-decoration: underline; }
-em { font-style: normal; color: #777; }
-</style>
-<div class="content" role="main">
- <img src="<%= @error_config['logo'] %>" <% if @error_config['logo_2x']
%>srcset="<%= @error_config['logo_2x'] %> 2x"<% end %> alt="<%
@error_config['logo_alt'] %>" width=135></a>
- <h1>Error</h1>
- <p><%= @error_description %></p>
-</div>
-<% if @error_details %><div class="footer"><p><%= @error_details
%></p></div><% end %>
-</html>
diff --git a/modules/mediawiki/templates/errorpage.html.erb
b/modules/mediawiki/templates/errorpage.html.erb
index 17d6303..fe79a50 100644
--- a/modules/mediawiki/templates/errorpage.html.erb
+++ b/modules/mediawiki/templates/errorpage.html.erb
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang=en>
+<% if @errorpage['favicon'] %><link rel="shortcut icon" href="<%=
@errorpage['favicon'] %>" /><% end %>
<meta charset=utf-8>
<title><%= @errorpage['title'] %></title>
<style>
@@ -17,7 +18,7 @@
.text-muted { color: #777; }
</style>
<div class="content" role="main">
-<a href="https://www.wikimedia.org";><img
src="https://www.wikimedia.org/static/images/wmf.png";
srcset="https://www.wikimedia.org/static/images/wmf-2x.png 2x" alt=Wikimedia
width=135 height=135></a>
+<% if @errorpage['logo_link'] %><a href="<%= @errorpage['logo_link'] %>"><%
end %><img src="<%= @errorpage['logo_src'] %>" srcset="<%=
@errorpage['logo_srcset'] %>" alt="<%= @errorpage['logo_alt'] %>" width=135
height=135><% if @errorpage['logo_link'] %></a><% end %>
<h1>Error</h1>
<%= @errorpage['content'] %>
</div>
diff --git a/modules/varnish/manifests/common/vcl.pp
b/modules/varnish/manifests/common/vcl.pp
index 9cda0f0..6e18e05 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -17,6 +17,9 @@
$errorpage = {
title => 'Wikimedia Error',
+ logo_link => 'https://www.wikimedia.org',
+ logo_src => 'https://www.wikimedia.org/static/images/wmf.png',
+ logo_srcset => 'https://www.wikimedia.org/static/images/wmf-2x.png 2x',
content => '<p>Our servers are currently under maintenance or
experiencing a technical problem. Please <a href="" title="Reload this page"
onclick="window.location.reload(false); return false">try again</a> in a
few minutes.</p><p>See the error message at the bottom of this page for
more information.</p>',
# Use append instead of footer because we intentionally leave the
# "div.footer > p > code" stack unclosed.
--
To view, visit https://gerrit.wikimedia.org/r/350494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I764d00c7b40ad0931590f04ed2f76ecbd84b33ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![https://www.wikimedia.org/static/images/wmf.png"](https://www.wikimedia.org/static/images/wmf.png"){kind=link}
