diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 9bd1cf2a..1cbd87d3 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -89,6 +89,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. +# # == Dependencies # # requires Class['apache'] & Class['manila'] @@ -121,6 +126,7 @@ class manila::wsgi::apache ( $access_log_format = false, $error_log_file = undef, $custom_wsgi_process_options = {}, + $vhost_custom_fragment = undef, ) { include ::manila::deps @@ -148,6 +154,7 @@ class manila::wsgi::apache ( ssl_key => $ssl_key, threads => $threads, user => 'manila', + vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'manila-api', wsgi_process_display_name => $wsgi_process_display_name, @@ -161,4 +168,4 @@ class manila::wsgi::apache ( error_log_file => $error_log_file, require => Anchor['manila::install::end'], } -} \ No newline at end of file +} diff --git a/spec/classes/manila_wsgi_apache_spec.rb b/spec/classes/manila_wsgi_apache_spec.rb index e884b2aa..29259203 100644 --- a/spec/classes/manila_wsgi_apache_spec.rb +++ b/spec/classes/manila_wsgi_apache_spec.rb @@ -42,7 +42,8 @@ describe 'manila::wsgi::apache' do }, :access_log_file => '/var/log/httpd/access_log', :access_log_format => 'some format', - :error_log_file => '/var/log/httpd/error_log' + :error_log_file => '/var/log/httpd/error_log', + :vhost_custom_fragment => 'Timeout 99' } end it { is_expected.to contain_class('manila::params') } @@ -58,6 +59,7 @@ describe 'manila::wsgi::apache' do :ssl => false, :threads => 1, :user => 'manila', + :vhost_custom_fragment => 'Timeout 99', :workers => 37, :wsgi_daemon_process => 'manila-api', :wsgi_process_display_name => 'manila-api',