Dzahn has submitted this change and it was merged.
Change subject: Gerrit: move static assets to *.cache.* filenames
......................................................................
Gerrit: move static assets to *.cache.* filenames
This lets Gerrit serve them with 1y expires, perfect for things like
the logo and background image that never change.
Change-Id: Ie5aca12dafd20ca79fb024e35c71a87818c076e2
---
M modules/gerrit/files/skin/GerritSite.css
R modules/gerrit/files/skin/page-bkg.cache.jpg
R modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
M modules/gerrit/manifests/jetty.pp
4 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/files/skin/GerritSite.css
b/modules/gerrit/files/skin/GerritSite.css
index 51e797e..4766789 100644
--- a/modules/gerrit/files/skin/GerritSite.css
+++ b/modules/gerrit/files/skin/GerritSite.css
@@ -13,7 +13,7 @@
*/
body, .gwt-DialogBox .dialogMiddleCenter {
color: #353535 !important;
- background: #fff url(/r/static/page-bkg.jpg) no-repeat 0 0 !important;
+ background: #fff url(/r/static/page-bkg.cache.jpg) no-repeat 0 0
!important;
position: static;
}
@@ -60,7 +60,7 @@
color: #990000;
min-height: 59px;
- background: transparent url(/r/static/wikimedia-codereview-logo.png)
no-repeat 0 0;
+ background: transparent
url(/r/static/wikimedia-codereview-logo.cache.png) no-repeat 0 0;
text-indent: -9999px;
overflow: hidden;
}
diff --git a/modules/gerrit/files/skin/page-bkg.jpg
b/modules/gerrit/files/skin/page-bkg.cache.jpg
similarity index 100%
rename from modules/gerrit/files/skin/page-bkg.jpg
rename to modules/gerrit/files/skin/page-bkg.cache.jpg
Binary files differ
diff --git a/modules/gerrit/files/skin/wikimedia-codereview-logo.png
b/modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
similarity index 100%
rename from modules/gerrit/files/skin/wikimedia-codereview-logo.png
rename to modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
Binary files differ
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 0d20f91..aae63cc 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -174,18 +174,18 @@
ensure => absent,
}
- file { '/var/lib/gerrit2/review_site/static/page-bkg.jpg':
+ file { '/var/lib/gerrit2/review_site/static/page-bkg.cache.jpg':
owner => 'gerrit2',
group => 'gerrit2',
mode => '0444',
- source => 'puppet:///modules/gerrit/skin/page-bkg.jpg',
+ source => 'puppet:///modules/gerrit/skin/page-bkg.cache.jpg',
}
- file { '/var/lib/gerrit2/review_site/static/wikimedia-codereview-logo.png':
+ file {
'/var/lib/gerrit2/review_site/static/wikimedia-codereview-logo.cache.png':
owner => 'gerrit2',
group => 'gerrit2',
mode => '0444',
- source =>
'puppet:///modules/gerrit/skin/wikimedia-codereview-logo.png',
+ source =>
'puppet:///modules/gerrit/skin/wikimedia-codereview-logo.cache.png',
}
file { '/var/lib/gerrit2/review_site/hooks':
--
To view, visit https://gerrit.wikimedia.org/r/257676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5aca12dafd20ca79fb024e35c71a87818c076e2
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
