Merge branch 'master' into client-fqdn

Author: tedivm

manifests/client/user.pp

@@ -43,6 +43,7 @@
     sshkeys::set_authorized_key { "${server_user_exploded} to ${client_user}":
       local_user  => $client_user,
       remote_user => $server_user_exploded,
+      target      => "/home/${client_user}/.ssh/authorized_keys",
       require     => User[$client_user],
       options     => [
         "command=\"${allowed_command}\"",

manifests/server/config.pp

@@ -78,7 +78,7 @@
   file { $log_file :
     ensure  => present,
     require => File[$log_path]
-  } ->
+  }
 
   # cronjobs