Merge pull request #55 from seanmil/use_certname

Use certname consistently for key files

Author: suckatrash

manifests/certs.pp

@@ -4,8 +4,8 @@
 
   $ssl_dir        = $settings::ssldir
   $cert_dir       = "/etc/${service}"
-  $client_pem_key = "${ssl_dir}/private_keys/${facts['networking']['fqdn']}.pem"
-  $client_cert    = "${ssl_dir}/certs/${facts['networking']['fqdn']}.pem"
+  $client_pem_key = "${ssl_dir}/private_keys/${trusted['certname']}.pem"
+  $client_cert    = "${ssl_dir}/certs/${trusted['certname']}.pem"
 
   File {
     owner   => $service,

templates/telegraf.conf.epp

@@ -74,7 +74,7 @@
 <% unless $postgres_host_list.empty {-%>
 <% $postgres_host_list.each | $pg_host| {-%>
 [[inputs.postgresql_extensible]]
-  address = "postgres://telegraf@<%= $pg_host %>/pe-puppetdb?sslmode=require&sslkey=/etc/telegraf/<%= $facts['networking']['fqdn'] %>_key.pem&sslcert=/etc/telegraf/<%= $facts['networking']['fqdn'] %>_cert.pem&sslrootcert=/etc/telegraf/ca.pem"
+  address = "postgres://telegraf@<%= $pg_host %>/pe-puppetdb?sslmode=require&sslkey=/etc/telegraf/<%= $trusted['certname'] %>_key.pem&sslcert=/etc/telegraf/<%= $trusted['certname'] %>_cert.pem&sslrootcert=/etc/telegraf/ca.pem"
   outputaddress = "<%= $pg_host %>"
   databases = ["pe-puppetdb","pe-rbac","pe-activity","pe-classifier"]
   [[inputs.postgresql_extensible.query]]