summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-04-18 01:10:16 -0700
committerelijah <elijah@riseup.net>2013-04-18 01:10:16 -0700
commit1d29e7ad92d4197fed3812add3ad195800f53281 (patch)
tree67b01361e6d95771e69edf6b4eb9532014e8c75f /puppet/modules
parent0ad85d0afa39817b07e0f774c7437d1ca9fd5fd6 (diff)
webapp: removed "Alias /1" from apache config
Diffstat (limited to 'puppet/modules')
-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
2 files changed, 1 insertions, 3 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 cdfcbd68..20d3dc9a 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
@@ -22,7 +22,6 @@ Listen 0.0.0.0:<%= api_port %>
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 4928cdd6..2ccc4418 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,7 +22,6 @@
RequestHeader set X_FORWARDED_PROTO 'https'
DocumentRoot /srv/leap-webapp/public
- Alias /1 /srv/leap-webapp/public
RewriteEngine On
# Check for maintenance file and redirect all requests
@@ -40,7 +39,7 @@
<% if (defined? @services) and (services.is_a? Array) and (@services.include? 'monitor') -%>
<DirectoryMatch (/usr/share/nagios3/htdocs|/usr/lib/cgi-bin/nagios3|/etc/nagios3/stylesheets)>
PassengerEnabled off
- AllowOverride all
+ AllowOverride all
</DirectoryMatch>
<% end -%>
</VirtualHost>