From 1d29e7ad92d4197fed3812add3ad195800f53281 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 18 Apr 2013 01:10:16 -0700 Subject: webapp: removed "Alias /1" from apache config --- puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 1 - puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'puppet/modules/site_apache/templates') 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') -%> PassengerEnabled off - AllowOverride all + AllowOverride all <% end -%> -- cgit v1.2.3 From 264fa32a719d77b15e623cc3fc4574fd04837716 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 21 May 2013 17:42:40 -0400 Subject: change paths for leap webapp to be under /srv/leap/webapp from /srv/leap-webapp --- puppet/modules/site_apache/templates/vhosts.d/api.conf.erb | 2 +- puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apache/templates') 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 20d3dc9a..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,7 +21,7 @@ Listen 0.0.0.0:<%= api_port %> RequestHeader set X_FORWARDED_PROTO 'https' - DocumentRoot /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 2ccc4418..3055a7bb 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,7 +21,7 @@ RequestHeader set X_FORWARDED_PROTO 'https' - DocumentRoot /srv/leap-webapp/public + DocumentRoot /srv/leap/webapp/public RewriteEngine On # Check for maintenance file and redirect all requests -- cgit v1.2.3 From 89ad90073b5289da62eed74c8794e2911672081f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 25 Jun 2013 15:51:37 -0400 Subject: fix for #2986 - the services variable is no longer an array Change-Id: Ia6fc60c0c1fdfa50e1d6d981699c1d8010df63fc --- puppet/modules/site_apache/templates/vhosts.d/leap_webapp.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/modules/site_apache/templates') 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 3055a7bb..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 @@ -36,7 +36,7 @@ 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') -%> PassengerEnabled off AllowOverride all -- cgit v1.2.3