[MediaWiki-commits] [Gerrit] operations/puppet[production]: striker: Add custom error pages to apache vhost

2016-09-04 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: striker: Add custom error pages to apache vhost
..


striker: Add custom error pages to apache vhost

Bug: T144040
Change-Id: I844510b030c0487c34f0843f5b5a6901777cc912
---
M modules/striker/templates/apache.conf.erb
1 file changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Alex Monk: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/striker/templates/apache.conf.erb 
b/modules/striker/templates/apache.conf.erb
index ec2db0b..78043bf 100644
--- a/modules/striker/templates/apache.conf.erb
+++ b/modules/striker/templates/apache.conf.erb
@@ -50,6 +50,14 @@
 ProxyPass !
   
 
+  
+# Error pages should not be cached
+ExpiresDefault "access plus 0 seconds"
+Header set Cache-Control "no-cache"
+# Do not proxy matching requests
+ProxyPass !
+  
+
   # Reverse proxy everything that's not excluded to the uwsgi backend
   ProxyPassMatch "/(.*)" "balancer://uwsgi/$1"
   
@@ -61,5 +69,9 @@
   LogLevel warn
   CustomLog /var/log/apache2/<%= @server_name %>-access.log wmf
   ErrorLog  /var/log/apache2/<%= @server_name %>-error.log
+
+  ErrorDocument 502 /502.html
+  ErrorDocument 503 /503.html
+  ErrorDocument 504 /504.html
 
 # vim:ft=apache:sw=2:ts=2:sts=2:et:

-- 
To view, visit https://gerrit.wikimedia.org/r/308359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I844510b030c0487c34f0843f5b5a6901777cc912
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Andrew Bogott 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: Yuvipanda 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: striker: Add custom error pages to apache vhost

2016-09-03 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/308359

Change subject: striker: Add custom error pages to apache vhost
..

striker: Add custom error pages to apache vhost

Bug: T144040
Change-Id: I844510b030c0487c34f0843f5b5a6901777cc912
---
M modules/striker/templates/apache.conf.erb
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/59/308359/1

diff --git a/modules/striker/templates/apache.conf.erb 
b/modules/striker/templates/apache.conf.erb
index ec2db0b..599efaa 100644
--- a/modules/striker/templates/apache.conf.erb
+++ b/modules/striker/templates/apache.conf.erb
@@ -50,6 +50,14 @@
 ProxyPass !
   
 
+  
+# Error pages should not be cached
+ExpiresDefault "access plus 0 seconds"
+Header set Cache-Control "no-cache"
+# Do not proxy matching requests
+ProxyPass !
+  
+
   # Reverse proxy everything that's not excluded to the uwsgi backend
   ProxyPassMatch "/(.*)" "balancer://uwsgi/$1"
   
@@ -61,5 +69,9 @@
   LogLevel warn
   CustomLog /var/log/apache2/<%= @server_name %>-access.log wmf
   ErrorLog  /var/log/apache2/<%= @server_name %>-error.log
+
+  ErrorDocument 502 /502.html
+  ErrorDocument 503 /503.html
+  ErrorDocument 504 /504.html
 
 # vim:ft=apache:sw=2:ts=2:sts=2:et:

-- 
To view, visit https://gerrit.wikimedia.org/r/308359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I844510b030c0487c34f0843f5b5a6901777cc912
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits