diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index cbe94ffa..b5ee0ecb 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -41,7 +41,7 @@ # # [*ssl*] # Use ssl ? (boolean) -# Optional. Defaults to true +# Optional. Defaults to false # # [*workers*] # Number of WSGI workers to spawn. @@ -110,7 +110,7 @@ class manila::wsgi::apache ( $port = 8786, $bind_host = undef, $path = '/', - $ssl = undef, + $ssl = false, $workers = $::os_workers, $ssl_cert = undef, $ssl_key = undef, @@ -129,11 +129,6 @@ class manila::wsgi::apache ( $vhost_custom_fragment = undef, ) { - if $ssl == undef { - warning('Default of the ssl parameter will be changed in a future release') - } - $ssl_real = pick($ssl, true) - include manila::deps include manila::params @@ -146,7 +141,7 @@ class manila::wsgi::apache ( path => $path, priority => $priority, servername => $servername, - ssl => $ssl_real, + ssl => $ssl, ssl_ca => $ssl_ca, ssl_cert => $ssl_cert, ssl_certs_dir => $ssl_certs_dir, diff --git a/releasenotes/notes/disable-apache-ssl-434fc2d002f3e9fd.yaml b/releasenotes/notes/disable-apache-ssl-434fc2d002f3e9fd.yaml new file mode 100644 index 00000000..3509e999 --- /dev/null +++ b/releasenotes/notes/disable-apache-ssl-434fc2d002f3e9fd.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Default value of the ``manila::wsgi::apache::ssl`` parameter has been + changed from ``true`` to ``false`` and now ssl is disabled by default. diff --git a/spec/classes/manila_wsgi_apache_spec.rb b/spec/classes/manila_wsgi_apache_spec.rb index aa0a3133..4d6ab583 100644 --- a/spec/classes/manila_wsgi_apache_spec.rb +++ b/spec/classes/manila_wsgi_apache_spec.rb @@ -10,7 +10,7 @@ describe 'manila::wsgi::apache' do :group => 'manila', :path => '/', :servername => facts[:fqdn], - :ssl => true, + :ssl => false, :threads => 1, :user => 'manila', :workers => facts[:os_workers], @@ -31,7 +31,7 @@ describe 'manila::wsgi::apache' do :servername => 'dummy.host', :bind_host => '10.42.51.1', :port => 12345, - :ssl => false, + :ssl => true, :wsgi_process_display_name => 'manila-api', :workers => 37, :custom_wsgi_process_options => { @@ -50,7 +50,7 @@ describe 'manila::wsgi::apache' do :group => 'manila', :path => '/', :servername => 'dummy.host', - :ssl => false, + :ssl => true, :threads => 1, :user => 'manila', :vhost_custom_fragment => 'Timeout 99',