diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 1d9d7e47..e31f066a 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -93,6 +93,11 @@ # { python-path => '/my/python/virtualenv' } # Defaults to {} # +# [*vhost_custom_fragment*] +# (optional) Passes a string of custom configuration +# directives to be placed at the end of the vhost configuration. +# Defaults to undef. +# # == Authors # # Ade Lee @@ -122,6 +127,7 @@ class barbican::wsgi::apache ( $access_log_format = false, $error_log_file = undef, $custom_wsgi_process_options = {}, + $vhost_custom_fragment = undef, ) { include barbican::deps @@ -169,6 +175,7 @@ class barbican::wsgi::apache ( ssl_key => $ssl_key, threads => $threads, user => 'barbican', + vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'barbican-api', wsgi_process_display_name => $wsgi_process_display_name, diff --git a/spec/classes/barbican_wsgi_apache_spec.rb b/spec/classes/barbican_wsgi_apache_spec.rb index 88468a80..452bfc32 100644 --- a/spec/classes/barbican_wsgi_apache_spec.rb +++ b/spec/classes/barbican_wsgi_apache_spec.rb @@ -62,6 +62,7 @@ describe 'barbican::wsgi::apache' do :custom_wsgi_process_options => { 'python_path' => '/my/python/path', }, + :vhost_custom_fragment => 'Timeout 99', } end it { is_expected.to contain_class('barbican::params') } @@ -77,6 +78,7 @@ describe 'barbican::wsgi::apache' do :ssl => false, :threads => 1, :user => 'barbican', + :vhost_custom_fragment => 'Timeout 99', :workers => 37, :wsgi_daemon_process => 'barbican-api', :wsgi_process_display_name => 'barbican-api',