fix voxpupuli#263 string containing only a variable, improve code qua…

…lity
n00by · Apr 26, 2018 · 5a6fa34 · 5a6fa34
1 parent 05110ca
commit 5a6fa34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/manifests/feature/influxdb.pp b/manifests/feature/influxdb.pp
@@ -151,8 +151,8 @@
   validate_re($flush_interval, '^\d+[ms]*$')
   validate_integer($flush_threshold)
 
-  $host_template = { measurement => "${host_measurement}", tags => $host_tags }
-  $service_template = { measurement => "${service_measurement}", tags => $service_tags}
+  $host_template = { measurement => $host_measurement, tags => $host_tags }
+  $service_template = { measurement => $service_measurement, tags => $service_tags}
 
   # Set defaults for certificate stuff and/or do validation
   if $ssl_key_path {

diff --git a/manifests/pki/ca.pp b/manifests/pki/ca.pp
@@ -157,7 +157,7 @@
   exec { 'icinga2 pki create certificate signing request':
     command => "icinga2 pki new-cert --cn '${::fqdn}' --key '${_ssl_key_path}' --csr '${_ssl_csr_path}'",
     creates => $_ssl_key_path,
-    require => File["${_ssl_cacert_path}"]
+    require => File[$_ssl_cacert_path]
   } ->
     file {
       $_ssl_key_path: