diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 8760002..04b120d 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -84,6 +84,11 @@ # (Optional) The error log file name for the virtualhost. # Defaults to undef # +# [*vhost_custom_fragment*] +# (optional) Passes a string of custom configuration +# directives to be placed at the end of the vhost configuration. +# Defaults to undef. +# # == Examples # # include apache @@ -111,6 +116,7 @@ class placement::wsgi::apache ( $access_log_file = false, $access_log_format = false, $error_log_file = undef, + $vhost_custom_fragment = undef, ) { include placement::params @@ -163,6 +169,7 @@ class placement::wsgi::apache ( ssl_key => $ssl_key, threads => $threads, user => 'placement', + vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'placement-api', wsgi_process_display_name => $wsgi_process_display_name, diff --git a/spec/classes/placement_wsgi_apache.rb b/spec/classes/placement_wsgi_apache.rb index aec7a84..2a98f0c 100644 --- a/spec/classes/placement_wsgi_apache.rb +++ b/spec/classes/placement_wsgi_apache.rb @@ -64,6 +64,7 @@ describe 'placement::wsgi::apache' do :ssl_crl_path => '/etc/ssl/crl', :ssl_crl => '/etc/ssl/certs/crl.crt', :ssl_certs_dir => '/etc/ssl/certs', + :vhost_custom_fragment => 'Timeout 99', :wsgi_process_display_name => 'custom', :threads => 5, :priority => '25', @@ -106,6 +107,7 @@ describe 'placement::wsgi::apache' do :ssl_key => params[:ssl_key], :threads => params[:threads], :user => 'placement', + :vhost_custom_fragment => 'Timeout 99', :workers => params[:workers], :wsgi_daemon_process => 'placement-api', :wsgi_process_display_name => params[:wsgi_process_display_name],