From 289a00a149ac08d01b8ee638620d8c2928966fa3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 15 Nov 2013 01:02:25 -0800
Subject: improvements to webapp deployment: allow for greater customization,
 allow for custom git source, improve apache config.

---
 puppet/modules/site_apache/manifests/module/expires.pp            | 4 ++++
 .../modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb   | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 puppet/modules/site_apache/manifests/module/expires.pp

(limited to 'puppet/modules/site_apache')

diff --git a/puppet/modules/site_apache/manifests/module/expires.pp b/puppet/modules/site_apache/manifests/module/expires.pp
new file mode 100644
index 00000000..f73a5607
--- /dev/null
+++ b/puppet/modules/site_apache/manifests/module/expires.pp
@@ -0,0 +1,4 @@
+class site_apache::module::expires ( $ensure = present )
+{
+  apache::module { 'expires': ensure => $ensure }
+}
diff --git a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
index afc19782..a001552a 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb
@@ -45,6 +45,14 @@
   PassengerFriendlyErrorPages off
   SetEnv TMPDIR /var/tmp
 
+  # Allow rails assets to be cached for a very long time (since the URLs change whenever the content changes)
+  <Location /assets/>
+    Header unset ETag
+    FileETag None
+    ExpiresActive On
+    ExpiresDefault "access plus 1 year"
+  </Location>
+
  <% if (defined? @services) and (@services.include? 'monitor') -%>
  <DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
     PassengerEnabled off
-- 
cgit v1.2.3