diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 2f0be813..818eac7c 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -50,7 +50,7 @@ # # [*priority*] # (optional) The priority for the vhost. -# Defaults to '10' +# Defaults to 10 # # [*threads*] # (optional) The number of threads for the vhost. @@ -72,11 +72,11 @@ # # [*access_log_file*] # The log file name for the virtualhost. -# Optional. Defaults to false. +# Optional. Defaults to nil. # # [*access_log_format*] # The log format for the virtualhost. -# Optional. Defaults to false. +# Optional. Defaults to nil. # # [*error_log_file*] # The error log file name for the virtualhost. @@ -121,9 +121,9 @@ class gnocchi::wsgi::apache ( $ssl_certs_dir = undef, $wsgi_process_display_name = undef, $threads = 1, - $priority = '10', - $access_log_file = false, - $access_log_format = false, + $priority = 10, + $access_log_file = undef, + $access_log_format = undef, $error_log_file = undef, $custom_wsgi_process_options = {}, $vhost_custom_fragment = undef, diff --git a/spec/classes/gnocchi_wsgi_apache_spec.rb b/spec/classes/gnocchi_wsgi_apache_spec.rb index ff23a912..704b191a 100644 --- a/spec/classes/gnocchi_wsgi_apache_spec.rb +++ b/spec/classes/gnocchi_wsgi_apache_spec.rb @@ -9,6 +9,7 @@ describe 'gnocchi::wsgi::apache' do :bind_port => 8041, :group => 'gnocchi', :path => '/', + :priority => 10, :servername => facts[:fqdn], :ssl => false, :threads => 1, @@ -20,8 +21,8 @@ describe 'gnocchi::wsgi::apache' do :wsgi_script_file => 'app', :wsgi_script_source => platform_params[:wsgi_script_source], :custom_wsgi_process_options => {}, - :access_log_file => false, - :access_log_format => false, + :access_log_file => nil, + :access_log_format => nil, )} end