Skip to content

Commit 4480a86

Browse files
author
wenchma
committed
Remove the extra curly braces for format_ssl_ciphers
Fixes issue #259
1 parent 3277655 commit 4480a86

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

libraries/default.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def format_ssl_versions
4444
end
4545

4646
def format_ssl_ciphers
47-
Array(node['rabbitmq']['ssl_ciphers']).map { |n| "{#{n}}" }.join(',')
47+
Array(node['rabbitmq']['ssl_ciphers']).map { |n| "'#{n}'" }.join(',')
4848
end
4949
end
5050
end

spec/default_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,14 @@
9595
node.set['rabbitmq']['ssl'] = true
9696
node.set['rabbitmq']['ssl_ciphers'] = ['ecdhe_ecdsa,aes_128_cbc,sha256', 'ecdhe_ecdsa,aes_256_cbc,sha']
9797
expect(chef_run).to render_file('/etc/rabbitmq/rabbitmq.config').with_content(
98-
'{ciphers,[{ecdhe_ecdsa,aes_128_cbc,sha256},{ecdhe_ecdsa,aes_256_cbc,sha}]}')
98+
"{ciphers,['ecdhe_ecdsa,aes_128_cbc,sha256','ecdhe_ecdsa,aes_256_cbc,sha']}")
9999
end
100100

101101
it 'allows web console ssl ciphers' do
102102
node.set['rabbitmq']['web_console_ssl'] = true
103103
node.set['rabbitmq']['ssl_ciphers'] = ['ecdhe_ecdsa,aes_128_cbc,sha256', 'ecdhe_ecdsa,aes_256_cbc,sha']
104104
expect(chef_run).to render_file('/etc/rabbitmq/rabbitmq.config').with_content(
105-
'{ciphers,[{ecdhe_ecdsa,aes_128_cbc,sha256},{ecdhe_ecdsa,aes_256_cbc,sha}]}')
105+
"{ciphers,['ecdhe_ecdsa,aes_128_cbc,sha256','ecdhe_ecdsa,aes_256_cbc,sha']}")
106106
end
107107

108108
it 'should set additional rabbitmq config' do

0 commit comments

Comments
 (0)