From f3c0115743cab9d4e6c08b654b67631566572d41 Mon Sep 17 00:00:00 2001
From: Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Date: Thu, 21 May 2015 10:29:03 -0400
Subject: Simplify ssh_authorized_key

---
 manifests/ssh_authorized_key.pp | 55 ++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/manifests/ssh_authorized_key.pp b/manifests/ssh_authorized_key.pp
index f942d62..7702914 100644
--- a/manifests/ssh_authorized_key.pp
+++ b/manifests/ssh_authorized_key.pp
@@ -48,45 +48,32 @@ define sshd::ssh_authorized_key(
   # nothing a user can't already do by writing their own file resources,
   # we still depend on the filesystem permissions to keep things safe.
   if $override_builtin {
-    case $options {
-      'absent': {
-        info("not setting any option for ssh_authorized_key: ${name}")
-        $header = "# HEADER: This file is managed by Puppet.\n"
 
-        file { $real_target:
-          ensure => $ensure,
-          content => "${header}${type} ${key}",
-          owner => $real_user,
-          mode => '0600';
-        }
-      }
-      default: {
-        file { $real_target:
-          ensure => $ensure,
-          content => "${header}${options} ${type} ${key}",
-          owner => $real_user,
-          mode => '0600';
-        }
-      }
+    $header = '# HEADER: This file is managed by Puppet.'
+
+    file { $real_target:
+      ensure  => $ensure,
+      owner   => $real_user,
+      mode    => '0600',
+      content => $options ? {
+        'absent' => "${header}\n${type} ${key}",
+        default  => "${header}\n${options} ${type} ${key}",
+      },
     }
+
   } else {
+
     ssh_authorized_key{$name:
-      ensure => $ensure,
-      type   => $type,
-      key    => $key,
-      user   => $real_user,
-      target => $real_target,
+      ensure  => $ensure,
+      type    => $type,
+      key     => $key,
+      user    => $real_user,
+      target  => $real_target,
+      options => $options ? {
+        'absent' => undef,
+        default  => $options,
+      },
     }
 
-    case $options {
-      'absent': {
-        info("not setting any option for ssh_authorized_key: ${name}")
-      }
-      default: {
-        Ssh_authorized_key[$name]{
-          options => $options,
-        }
-      }
-    }
   }
 }
-- 
cgit v1.2.3