diff --git a/manifests/init.pp b/manifests/init.pp index 5db9e90c7..de6472f9e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -55,6 +55,7 @@ $conf_template = $::apache::params::conf_template, $servername = $::apache::params::servername, $pidfile = $::apache::params::pidfile, + $rewrite_lock = false, $manage_user = true, $manage_group = true, $user = $::apache::params::user, diff --git a/templates/httpd.conf.erb b/templates/httpd.conf.erb index e0d16e122..6fb989244 100644 --- a/templates/httpd.conf.erb +++ b/templates/httpd.conf.erb @@ -11,6 +11,10 @@ KeepAlive <%= @keepalive %> MaxKeepAliveRequests <%= @max_keepalive_requests %> KeepAliveTimeout <%= @keepalive_timeout %> +<%- if @rewrite_lock and scope.function_versioncmp([@apache_version, '2.2']) <= 0 -%> +RewriteLock <%= @rewrite_lock %> +<%- end -%> + User <%= @user %> Group <%= @group %>