From 23425ea940819d7a5717847b0df11fb8e75472f3 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 5 Apr 2019 14:09:00 -0700
Subject: [PATCH] Use mod_expires to set cache headers for log files

Our CI jobs' logserver wasn't setting cache headers so browsers were
always downloading the log files on each request. Reduce load on the
logserver and improve performance by users via the setting of a 2 week
ttl on log data.

This should be safe because each job writes to a uuid identified dir and
that data doesn't get overwritten. Once written the data is static.

Change-Id: Ic99df4e4e64a6bf64e68e6f1bc297c91134ab716
---
 manifests/logserver.pp       | 6 ++++++
 templates/logs-dev.vhost.erb | 3 +++
 templates/logs.vhost.erb     | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/manifests/logserver.pp b/manifests/logserver.pp
index 3801ad1..a7baf60 100644
--- a/manifests/logserver.pp
+++ b/manifests/logserver.pp
@@ -69,6 +69,12 @@ class openstackci::logserver (
     }
   }
 
+  if ! defined(Httpd::Mod['expires']) {
+    httpd::mod { 'expires':
+        ensure => present,
+    }
+  }
+
   ::httpd::vhost { "logs.${domain}":
     port     => 80,
     priority => '50',
diff --git a/templates/logs-dev.vhost.erb b/templates/logs-dev.vhost.erb
index 9fde2bb..14937fb 100644
--- a/templates/logs-dev.vhost.erb
+++ b/templates/logs-dev.vhost.erb
@@ -65,6 +65,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     Order allow,deny
     allow from all
     Satisfy Any
+    ExpiresActive On
+    # Data in the logs server is static once generated by a job
+    ExpiresDefault "access plus 2 weeks"
   </Directory>
   <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
     Allow from all
diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb
index e51b275..626fb85 100644
--- a/templates/logs.vhost.erb
+++ b/templates/logs.vhost.erb
@@ -68,6 +68,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     Order allow,deny
     allow from all
     Satisfy Any
+    ExpiresActive On
+    # Data in the logs server is static once generated by a job
+    ExpiresDefault "access plus 2 weeks"
   </Directory>
   <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
     Allow from all