summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@linux.vnet.ibm.com>2015-09-17 14:25:42 -0700
committerJames E. Blair <jeblair@linux.vnet.ibm.com>2015-09-17 14:25:42 -0700
commit77cae247c916940f7e2287829c37b800d6d28bd7 (patch)
tree526cec1da1cca6e0346ef3492dc5a9d145aec09c
parent2016285e715432a7c1ddadb815b0700691fa76eb (diff)
Add "Satisfy any" to default vhost template
This is needed for Apache 2.4, and is compatible with 2.2. Change-Id: I5c8243c0031e295b5d88a21ac05f7a467beefa33
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Jenkins Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Submitted-by: Jenkins Submitted-at: Fri, 18 Sep 2015 01:17:18 +0000 Reviewed-on: https://review.openstack.org/224905 Project: openstack-infra/puppet-httpd Branch: refs/heads/master
-rw-r--r--templates/vhost-default.conf.erb1
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/vhost-default.conf.erb b/templates/vhost-default.conf.erb
index e9d2d77..fdc8336 100644
--- a/templates/vhost-default.conf.erb
+++ b/templates/vhost-default.conf.erb
@@ -17,6 +17,7 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
17 AllowOverride None 17 AllowOverride None
18 Order allow,deny 18 Order allow,deny
19 allow from all 19 allow from all
20 Satisfy any
20 </Directory> 21 </Directory>
21 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log 22 ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
22 LogLevel warn 23 LogLevel warn