Fixing what was broken in: 6b95a6a

This should resolve the following issues: voxpupuli#94 voxpupuli#65 (not 100% sure on this one)
ryno75 · Feb 4, 2016 · 0ebb5a4 · 0ebb5a4
1 parent 0bb8251
commit 0ebb5a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -44,7 +44,7 @@
 #   Defaults to 'None' ($::puppetboard::params::puppetdb_key)
 #
 # [*puppetdb_ssl_verify*]
-#   (string) whether PuppetDB uses SSL or not (true or false)
+#   (bool, string) whether PuppetDB uses SSL or not (true or false), or the path to the puppet CA
 #   Defaults to false ($::puppetboard::params::puppetdb_ssl_verify)
 #
 # [*puppetdb_cert*]
@@ -170,7 +170,11 @@
   validate_bool($experimental)
   validate_bool($localise_timestamp)
   validate_hash($extra_settings)
-  validate_bool($puppetdb_ssl_verify)
+  if $puppetdb_ssl_verify {
+    unless is_string($puppetdb_ssl_verify) {
+      validate_bool($puppetdb_ssl_verify)
+    }
+  }
 
   if $manage_group {
     group { $group:

diff --git a/templates/settings.py.erb b/templates/settings.py.erb
@@ -13,8 +13,10 @@ PUPPETDB_HOST = '<%= @puppetdb_host %>'
 <% if @puppetdb_port -%>
 PUPPETDB_PORT = <%= @puppetdb_port %>
 <% end -%>
-<% if @puppetdb_ssl_verify -%>
+<% if @puppetdb_ssl_verify.is_a? String -%>
 PUPPETDB_SSL_VERIFY = '<%= @puppetdb_ssl_verify %>'
+<% elsif @puppetdb_ssl_verify -%>
+PUPPETDB_SSL_VERIFY = True
 <% else -%>
 PUPPETDB_SSL_VERIFY = False
 <% end -%>