Merge pull request #324 from towo/feature/dig-for-facts

Use stdlib functions for hash key discovery

Author: bastelfreak

manifests/deploy/export.pp

@@ -18,63 +18,59 @@
   -> Openvpn::Client[$name]
   -> Openvpn::Deploy::Export[$name]
 
-  if $facts['openvpn'] {
-    if $facts['openvpn'][$server][$name] {
-      $data = $facts['openvpn'][$server][$name]
+  if fact("openvpn.${server}.${name}") {
+    $data = $facts['openvpn'][$server][$name]
 
-      @@file { "exported-${server}-${name}-config":
-        ensure  => file,
-        path    => "${openvpn::etc_directory}/openvpn/${name}.conf",
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0600',
-        content => $data['conf'],
-        tag     => "${server}-${name}",
-      }
+    @@file { "exported-${server}-${name}-config":
+      ensure  => file,
+      path    => "${openvpn::etc_directory}/openvpn/${name}.conf",
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600',
+      content => $data['conf'],
+      tag     => "${server}-${name}",
+    }
 
-      @@file { "exported-${server}-${name}-ca":
-        ensure  => file,
-        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ca.crt",
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0600',
-        content => $data['ca'],
-        tag     => "${server}-${name}",
-      }
+    @@file { "exported-${server}-${name}-ca":
+      ensure  => file,
+      path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ca.crt",
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600',
+      content => $data['ca'],
+      tag     => "${server}-${name}",
+    }
 
-      @@file { "exported-${server}-${name}-crt":
-        ensure  => file,
-        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.crt",
-        owner   => 'root',
-        group   => 'root',
-        mode    => '0600',
-        content => $data['crt'],
-        tag     => "${server}-${name}",
-      }
+    @@file { "exported-${server}-${name}-crt":
+      ensure  => file,
+      path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.crt",
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600',
+      content => $data['crt'],
+      tag     => "${server}-${name}",
+    }
+
+    @@file { "exported-${server}-${name}-key":
+      ensure  => file,
+      path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.key",
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0600',
+      content => $data['key'],
+      tag     => "${server}-${name}",
+    }
 
-      @@file { "exported-${server}-${name}-key":
+    if $tls_auth {
+      @@file { "exported-${server}-${name}-ta":
         ensure  => file,
-        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/${name}.key",
+        path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ta.key",
         owner   => 'root',
         group   => 'root',
         mode    => '0600',
-        content => $data['key'],
+        content => $data['ta'],
         tag     => "${server}-${name}",
       }
-
-      if $tls_auth {
-        @@file { "exported-${server}-${name}-ta":
-          ensure  => file,
-          path    => "${openvpn::etc_directory}/openvpn/keys/${name}/ta.key",
-          owner   => 'root',
-          group   => 'root',
-          mode    => '0600',
-          content => $data['ta'],
-          tag     => "${server}-${name}",
-        }
-      }
     }
-  } else {
-    fail('openvpn not defined, is pluginsync enabled?')
   }
 }