From 4e3d168d103fea6476694997275c4df4821535f3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 30 May 2014 14:52:26 -0700
Subject: static site: added rack support, added custom apache config

---
 puppet/modules/site_static/templates/rack.erb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 puppet/modules/site_static/templates/rack.erb

(limited to 'puppet/modules/site_static/templates/rack.erb')

diff --git a/puppet/modules/site_static/templates/rack.erb b/puppet/modules/site_static/templates/rack.erb
new file mode 100644
index 00000000..3e22e750
--- /dev/null
+++ b/puppet/modules/site_static/templates/rack.erb
@@ -0,0 +1,22 @@
+  #PassengerLogLevel 1
+  #RackEnv production
+  #PassengerFriendlyErrorPages on
+<%- if @location_path == '' -%>
+  <Directory "<%=@directory%>">
+    Order deny,allow
+    Allow from all
+    Options -MultiViews
+  </Directory>
+<%- else -%>
+  Alias /<%=@location_path%> "<%=@directory%>"
+  <Location /<%=@location_path%>>
+    RackBaseURI /<%=@location_path%>
+    PassengerBaseURI /<%=@location_path%>
+    PassengerAppRoot "<%=File.dirname(@directory)%>"
+  </Location>
+  <Directory "<%=@directory%>">
+    Order deny,allow
+    Allow from all
+    Options -MultiViews
+  </Directory>
+<%- end -%>
-- 
cgit v1.2.3


From 0c4c0ab6863c4c1cf59d0e999c7ba7bd41d3546c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sun, 1 Jun 2014 23:21:12 -0700
Subject: remove superfluous RackBaseURI directive

---
 puppet/modules/site_static/templates/rack.erb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'puppet/modules/site_static/templates/rack.erb')

diff --git a/puppet/modules/site_static/templates/rack.erb b/puppet/modules/site_static/templates/rack.erb
index 3e22e750..aae91f1c 100644
--- a/puppet/modules/site_static/templates/rack.erb
+++ b/puppet/modules/site_static/templates/rack.erb
@@ -1,5 +1,5 @@
   #PassengerLogLevel 1
-  #RackEnv production
+  #PassengerAppEnv production
   #PassengerFriendlyErrorPages on
 <%- if @location_path == '' -%>
   <Directory "<%=@directory%>">
@@ -10,7 +10,6 @@
 <%- else -%>
   Alias /<%=@location_path%> "<%=@directory%>"
   <Location /<%=@location_path%>>
-    RackBaseURI /<%=@location_path%>
     PassengerBaseURI /<%=@location_path%>
     PassengerAppRoot "<%=File.dirname(@directory)%>"
   </Location>
-- 
cgit v1.2.3