Issue 3587 - Unlink adblockplus::user from users::user

modules/adblockplus/manifests/user.pp

 # == Type: adblockplus::user
 #
 # Manage user accounts.
 #
 # === Parameters:
 #
 # [*authorized_keys*]
 #   A list of zero or more lines for the ~/.ssh/authorized_keys file of
 #   the respective user. Used as-is, joined by newline characters.
 #
@@ skipping 14 matching lines @@
 #     authorized_keys => [
 #       'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAA..................',
 #       'from="10.0.8.2" ssh-rsa AAAAB3NzaC..................',
 #     ],
 #     groups => ['sudo', 'adm'],
 #     password_hash => '$6$k.fe9F4U$OIav.SJ..................',
 #   }
 #
 define adblockplus::user (
   $authorized_keys = [],
+  $ensure = 'present',
   $groups = [],
   $password_hash = undef,
 ) {
 
   include adblockplus
   include users
 
-  users::user {"adblockplus::user#$name":
-    authorized_keys => join($authorized_keys, "\n"),
+  # Re-used multiple times below
+  $home = "/home/$name"
+
+  user {$name:
+    ensure => $ensure,
     groups => $groups,
+    home => $home,
+    managehome => true,
     password => $password_hash,
-    user_name => $name,
+    shell => '/bin/bash',
+  }
+
+  file {"$home/.ssh":
+    ensure => $ensure ? {
+      'present' => 'directory',
+      default => $ensure,
+    },
+    mode => 0700,
+    owner => $name,
+    require => User[$name],
+  }
+
+  file {"$home/.ssh/authorized_keys":
+    content => join($authorized_keys, "\n"),
+    ensure => $ensure,
+    mode => 0644,
+    owner => $name,
+    require => File["$home/.ssh"],
   }
 }