From 5754d3c5a10afbc7e3242299088bb3e1978cf7c7 Mon Sep 17 00:00:00 2001
From: Justin Lambert <jlambert@eml.cc>
Date: Sat, 29 Dec 2012 07:20:49 -0700
Subject: updated spacing for multi-line arrays.  updated selector for
 consistency

---
 manifests/client.pp | 14 +++++++-------
 manifests/server.pp | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/manifests/client.pp b/manifests/client.pp
index d45d29b..7927000 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -22,19 +22,19 @@ define openvpn::client($server, $remote_host = $fqdn) {
         "/etc/openvpn/${server}/download-configs/${name}/keys/${name}.crt":
             ensure  => link,
             target  => "/etc/openvpn/${server}/easy-rsa/keys/${name}.crt",
-            require => [ Exec["generate certificate for ${name} in context of ${server}"],
+            require => [  Exec["generate certificate for ${name} in context of ${server}"],
                           File["/etc/openvpn/${server}/download-configs/${name}/keys"] ];
 
         "/etc/openvpn/${server}/download-configs/${name}/keys/${name}.key":
             ensure  => link,
             target  => "/etc/openvpn/${server}/easy-rsa/keys/${name}.key",
-            require => [ Exec["generate certificate for ${name} in context of ${server}"],
+            require => [  Exec["generate certificate for ${name} in context of ${server}"],
                           File["/etc/openvpn/${server}/download-configs/${name}/keys"] ];
 
         "/etc/openvpn/${server}/download-configs/${name}/keys/ca.crt":
             ensure  => link,
             target  => "/etc/openvpn/${server}/easy-rsa/keys/ca.crt",
-            require => [ Exec["generate certificate for ${name} in context of ${server}"],
+            require => [  Exec["generate certificate for ${name} in context of ${server}"],
                           File["/etc/openvpn/${server}/download-configs/${name}/keys"] ];
     }
 
@@ -121,10 +121,10 @@ define openvpn::client($server, $remote_host = $fqdn) {
             cwd         => "/etc/openvpn/${server}/download-configs/",
             command     => "/bin/rm ${name}.tar.gz; tar --exclude=\\*.conf.d -chzvf ${name}.tar.gz ${name}",
             refreshonly => true,
-            require     => [ File["/etc/openvpn/${server}/download-configs/${name}/${name}.conf"],
-                            File["/etc/openvpn/${server}/download-configs/${name}/keys/ca.crt"],
-                            File["/etc/openvpn/${server}/download-configs/${name}/keys/${name}.key"],
-                            File["/etc/openvpn/${server}/download-configs/${name}/keys/${name}.crt"] ];
+            require     => [  File["/etc/openvpn/${server}/download-configs/${name}/${name}.conf"],
+                              File["/etc/openvpn/${server}/download-configs/${name}/keys/ca.crt"],
+                              File["/etc/openvpn/${server}/download-configs/${name}/keys/${name}.key"],
+                              File["/etc/openvpn/${server}/download-configs/${name}/keys/${name}.crt"] ];
     }
 
 
diff --git a/manifests/server.pp b/manifests/server.pp
index dbc8bb6..bfcaad8 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -3,9 +3,9 @@
 define openvpn::server($country, $province, $city, $organization, $email) {
     include openvpn
 
-    $easyrsa_source = $operatingsystem ? {
-      'centos' => '/usr/share/doc/openvpn-2.2.2/easy-rsa/2.0',
-      default => '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
+    $easyrsa_source = $::osfamily ? {
+      'RedHat'  => '/usr/share/doc/openvpn-2.2.2/easy-rsa/2.0',
+      default   => '/usr/share/doc/openvpn/examples/easy-rsa/2.0'
     }
 
     $link_openssl_cnf = $::osfamily ? {
@@ -34,9 +34,9 @@ define openvpn::server($country, $province, $city, $organization, $email) {
             server  => $name,
             require => File["/etc/openvpn/${name}"];
         "mode ${name}":
-            key    => 'mode',
-            value  => 'server',
-            server => $name;
+            key     => 'mode',
+            value   => 'server',
+            server  => $name;
     }
 
     exec {
-- 
cgit v1.2.3