New param sshkey_options

diff --git a/manifests/site.pp b/manifests/site.pp
index cda16627dd44ac34e6bc881d61fc91abefd35b0d..7877460349c8cc8b0594a88bae93be46cc1f53f0 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -20,6 +20,7 @@ define apache::site(
   $password             = '*',
   $comment              = '',
   $sshkey               = absent,
+  $sshkey_options       = [],
   $groups               = '',
   $shell                = '/bin/false',
   $manage_user          = true,
@@ -69,16 +70,17 @@ define apache::site(
 
       if !defined(User["$user"]) {
         user::manage { "$user":
-          tag      => "virtual",
-          password => $password,
-          gid      => $gid,
-          comment  => $comment,
-          ticket   => $ticket,
-          groups   => $groups,
-          sshkey   => $sshkey,
-          shell    => $shell,
-          ensure   => present,
-          require  => Group[$gid],
+          tag            => "virtual",
+          password       => $password,
+          gid            => $gid,
+          comment        => $comment,
+          ticket         => $ticket,
+          groups         => $groups,
+          sshkey         => $sshkey,
+          sshkey_options => $sshkey_options,
+          shell          => $shell,
+          ensure         => present,
+          require        => Group[$gid],
         }
       }
     }
@@ -106,7 +108,7 @@ define apache::site(
       privmode => '0640',
       ensure   => $ensure,
     }
-  
+
     ssl::check { "$name":
       file   => "/etc/ssl/certs/$name.crt",
       ensure => $ensure,
@@ -172,7 +174,7 @@ define apache::site(
             command => "/bin/mkdir -p ${docroot}",
             unless  => "/bin/sh -c '[ -e ${docroot} ]'",
             user    => root,
-            before  => File["${docroot}"], 
+            before  => File["${docroot}"],
           }
         }
       }