summaryrefslogtreecommitdiff
path: root/puppet/modules/site_apache/templates
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_apache/templates')
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/api.conf.erb3
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb7
2 files changed, 4 insertions, 6 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..ae894cd4 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/api.conf.erb
@@ -21,8 +21,7 @@ Listen 0.0.0.0:<%= api_port %>
RequestHeader set X_FORWARDED_PROTO 'https'
- DocumentRoot /srv/leap-webapp/public
- Alias /1 /srv/leap-webapp/public
+ DocumentRoot /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..4b051699 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
@@ -21,8 +21,7 @@
RequestHeader set X_FORWARDED_PROTO 'https'
- DocumentRoot /srv/leap-webapp/public
- Alias /1 /srv/leap-webapp/public
+ DocumentRoot /srv/leap/webapp/public
RewriteEngine On
# Check for maintenance file and redirect all requests
@@ -37,10 +36,10 @@
PassengerFriendlyErrorPages off
SetEnv TMPDIR /var/tmp
- <% if (defined? @services) and (services.is_a? Array) and (@services.include? 'monitor') -%>
+ <% if (defined? @services) 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>