summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-11-27 14:40:10 -0500
committerMicah Anderson <micah@riseup.net>2012-11-27 14:40:10 -0500
commite49f4038b9a5c6b8b0d3f0eed8735abf5ef54c0e (patch)
tree1e998f2f6a584d7ebe775eb397df73ffb9992041
parent0876cc7c712f273991cbb1177d7416afd0a1462d (diff)
map /1 -> document root
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/api.conf.erb1
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb3
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp1
3 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
index fc26190c..49bd5c79 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
@@ -20,6 +20,7 @@
RequestHeader set X_FORWARDED_PROTO 'https'
DocumentRoot /srv/leap_webapp/public
+ Alias /1 /srv/leap_webapp/public
# Check for maintenance file and redirect all requests
RewriteEngine On
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 bb035cd2..f2b43928 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
@@ -22,9 +22,10 @@
RequestHeader set X_FORWARDED_PROTO 'https'
DocumentRoot /srv/leap_webapp/public
+ Alias /1 /srv/leap_webapp/public
- # Check for maintenance file and redirect all requests
RewriteEngine On
+ # Check for maintenance file and redirect all requests
RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
RewriteCond %{SCRIPT_FILENAME} !maintenance.html
RewriteCond %{REQUEST_URI} !/images/maintenance.jpg
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index d6470186..8532cc38 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -13,6 +13,7 @@ class site_webapp::apache {
include apache::ssl
apache::module {
+ 'alias': ensure => present;
'rewrite': ensure => present;
'headers': ensure => present;
}