Project

General

Profile

« Previous | Next » 

Revision 92e45451

Added by Eric Helms about 3 years ago

Fix qpid-dispatch parameter deprecation warnings

Attribute 'certDb' of entity 'sslProfile' has been deprecated. Use 'caCertFile' instead
Attribute 'keyFile' of entity 'sslProfile' has been deprecated. Use 'privateKeyFile' instead
Attribute 'dir' of entity 'linkRoute' has been deprecated. Use 'direction' instead
Attribute 'timestamp' of entity 'log' has been deprecated. Use 'includeTimestamp' instead
Attribute 'output' of entity 'log' has been deprecated. Use 'outputFile' instead

View differences:

README.md
This module is designed to install and configure Qpid servers, clients, and dispatch routers for communication across a message bus.
## Supported Versions
The following versions of the qpid-cpp and qpid-dispatch are supported by this module
* qpid-dispatch 1.1.0+
* qpid-cpp 1.35+
## What qpid affects
* Installs and configures a Qpid server, client, or dispatch router
spec/defines/router_link_route_spec.rb
verify_concat_fragment_exact_contents(catalogue, 'qdrouter+link_route_broker-link.conf', [
'linkRoute {',
' prefix: unicorn.',
' dir: in',
' direction: in',
' connection: broker',
'}'
])
spec/defines/router_log_spec.rb
'log {',
' module: DEFAULT',
' enable: info+',
' timestamp: true',
' output: /var/log/qdrouterd.log',
' include-timestamp: true',
' output-file: /var/log/qdrouterd.log',
'}',
])
end
......
'log {',
' module: DEFAULT',
' enable: debug+',
' timestamp: false',
' output: /var/log/qpid.log',
' include-timestamp: false',
' output-file: /var/log/qpid.log',
'}'
])
end
......
'log {',
' module: DEFAULT',
' enable: debug+',
' timestamp: false',
' output: syslog',
' include-timestamp: false',
' output-file: syslog',
'}'
])
end
......
'log {',
' module: DEFAULT',
' enable: info+',
' timestamp: true',
' output: /var/log/qdrouterd.log',
' include-timestamp: true',
' output-file: /var/log/qdrouterd.log',
'}',
])
end
spec/defines/router_ssl_profile_spec.rb
verify_concat_fragment_exact_contents(catalogue, 'qdrouter+ssl_example.conf', [
'ssl-profile {',
' name: example',
' cert-db: /ca.pem',
' ca-cert-file: /ca.pem',
' cert-file: /cert.pem',
' key-file: /key.pem',
' private-key-file: /key.pem',
'}',
])
end
......
verify_concat_fragment_exact_contents(catalogue, 'qdrouter+ssl_example.conf', [
'ssl-profile {',
' name: example',
' cert-db: /some/where/ca.pem',
' ca-cert-file: /some/where/ca.pem',
' cert-file: /some/where/cert.pem',
' key-file: /some/where/key.pem',
' private-key-file: /some/where/key.pem',
' ciphers: ALL:!aNULL:!MD5:!DSS',
' protocols: TLSv1.1 TLSv1.2',
'}'
......
verify_concat_fragment_exact_contents(catalogue, 'qdrouter+ssl_example.conf', [
'ssl-profile {',
' name: example',
' cert-db: /ca.pem',
' ca-cert-file: /ca.pem',
' cert-file: /cert.pem',
' key-file: /key.pem',
' private-key-file: /key.pem',
' password: secret',
'}',
])
templates/router/link_route.conf.erb
linkRoute {
prefix: <%= @prefix %>
<% unless [nil, :undefined, :undef, ''].include?(@direction) -%>
dir: <%= @direction %>
direction: <%= @direction %>
<% end -%>
<% unless [nil, :undefined, :undef, ''].include?(@connection) -%>
connection: <%= @connection %>
templates/router/log.conf.erb
log {
module: <%= @module %>
enable: <%= @level %>
timestamp: <%= @timestamp %>
output: <%= @output %>
include-timestamp: <%= @timestamp %>
output-file: <%= @output %>
}
templates/router/ssl_profile.conf.erb
ssl-profile {
name: <%= @title %>
cert-db: <%= @ca %>
ca-cert-file: <%= @ca %>
cert-file: <%= @cert %>
key-file: <%= @key %>
private-key-file: <%= @key %>
<% unless [nil, :undefined, :undef, ''].include?(@password) -%>
password: <%= @password %>
<% end -%>

Also available in: Unified diff