Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/280204
Change subject: Allow browser to cache /portal static files.
......................................................................
Allow browser to cache /portal static files.
Set `s-maxage` and `max-age` to 1 day, removed `must-revalidate` as described
in phabricator.
Side note: there is a lot of duplication in this config, a higher level
abstraction might help bring visibility on the difference in configuration
between portals.
Bug: T126280
Change-Id: I430557df202380a082db052a1ba14ebbccf75aed
---
M modules/mediawiki/templates/apache/sites/wwwportals.conf.erb
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/280204/1
diff --git a/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb
b/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb
index cf4118f..5c5b63b 100644
--- a/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb
+++ b/modules/mediawiki/templates/apache/sites/wwwportals.conf.erb
@@ -27,7 +27,7 @@
<%- end -%>
RewriteRule ^/<%= @portal_dir %>/.*$ - [L]
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -95,7 +95,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -126,7 +126,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -157,7 +157,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -188,7 +188,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -219,7 +219,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
@@ -250,7 +250,7 @@
RewriteRule ^/portal/(.*)$ /<%= @portal_dir %>/$1 [L]
<%- end -%>
<Location ~ "^/$|^/<%= @portal_dir %>/">
- Header set Cache-Control "s-maxage=3600, must-revalidate, max-age=0"
+ Header set Cache-Control "s-maxage=86400, max-age=86400"
</Location>
# search-redirect.php, let it through
--
To view, visit https://gerrit.wikimedia.org/r/280204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I430557df202380a082db052a1ba14ebbccf75aed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: JGirault <jgira...@wikimedia.org>
Gerrit-Reviewer: Jdrewniak <jdrewn...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
