Merge pull request voxpupuli#530 from bostrowski13/master

added ssl_depth and password params for configuration
slm0n87 · Feb 21, 2017 · 88ca873 · 88ca873
2 parents 03c9e77 + 3d1dda6
commit 88ca873
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -424,6 +424,14 @@ Cert to use for SSL.
 
 Key to use for SSL.
 
+####`ssl_cert_password`
+
+Password used when generating CSR.
+
+####`ssl_depth`
+
+SSL verification depth.
+
 ####`ssl_management_port`
 
 SSL management port.

diff --git a/manifests/config.pp b/manifests/config.pp
@@ -38,6 +38,8 @@
   $ssl_cacert                 = $rabbitmq::ssl_cacert
   $ssl_cert                   = $rabbitmq::ssl_cert
   $ssl_key                    = $rabbitmq::ssl_key
+  $ssl_depth                  = $rabbitmq::ssl_depth
+  $ssl_cert_password          = $rabbitmq::ssl_cert_password
   $ssl_port                   = $rabbitmq::ssl_port
   $ssl_interface              = $rabbitmq::ssl_interface
   $ssl_management_port        = $rabbitmq::ssl_management_port

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -46,6 +46,8 @@
   $ssl_cacert                 = $rabbitmq::params::ssl_cacert,
   $ssl_cert                   = $rabbitmq::params::ssl_cert,
   $ssl_key                    = $rabbitmq::params::ssl_key,
+  $ssl_depth                  = $rabbitmq::params::ssl_depth,
+  $ssl_cert_password          = $rabbitmq::params::ssl_cert_password,
   $ssl_port                   = $rabbitmq::params::ssl_port,
   $ssl_interface              = $rabbitmq::params::ssl_interface,
   $ssl_management_port        = $rabbitmq::params::ssl_management_port,
@@ -140,6 +142,10 @@
   validate_string($ssl_cacert)
   validate_string($ssl_cert)
   validate_string($ssl_key)
+  if $ssl_depth {
+    validate_integer($ssl_depth)
+  }
+  validate_string($ssl_cert_password)
   validate_array($ssl_ciphers)
   if ! is_integer($ssl_port) {
     validate_re($ssl_port, '\d+')

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -104,6 +104,8 @@
   $ssl_cacert                  = 'UNSET'
   $ssl_cert                    = 'UNSET'
   $ssl_key                     = 'UNSET'
+  $ssl_depth                   = undef
+  $ssl_cert_password           = undef
   $ssl_port                    = '5671'
   $ssl_interface               = 'UNSET'
   $ssl_management_port         = '15671'

diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
@@ -59,6 +59,12 @@
                    <%- end -%>
                    {certfile,"<%= @ssl_cert %>"},
                    {keyfile,"<%= @ssl_key %>"},
+                   <%- if @ssl_cert_password != 'UNSET' -%>
+                   {password, "<%= @ssl_cert_password %>"},
+                   <%- end -%>
+                   <%- if @ssl_depth != 'UNSET' -%>
+                   {depth,<%= @ssl_depth %>},
+                   <%- end -%>
                    {verify,<%= @ssl_verify %>},
                    {fail_if_no_peer_cert,<%= @ssl_fail_if_no_peer_cert %>}
                    <%- if @ssl_versions -%>