| OLD | NEW | 
|---|
| 1 # == Type: adblockplus::user | 1 # == Type: adblockplus::user | 
| 2 # | 2 # | 
| 3 # Manage user accounts. | 3 # Manage user accounts. | 
| 4 # | 4 # | 
| 5 # === Parameters: | 5 # === Parameters: | 
| 6 # | 6 # | 
| 7 # [*authorized_keys*] | 7 # [*authorized_keys*] | 
| 8 #   A list of zero or more lines for the ~/.ssh/authorized_keys file of | 8 #   A list of zero or more lines for the ~/.ssh/authorized_keys file of | 
| 9 #   the respective user. Used as-is, joined by newline characters. | 9 #   the respective user. Used as-is, joined by newline characters. | 
| 10 # | 10 # | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 31 #   } | 31 #   } | 
| 32 # | 32 # | 
| 33 define adblockplus::user ( | 33 define adblockplus::user ( | 
| 34   $authorized_keys = [], | 34   $authorized_keys = [], | 
| 35   $ensure = 'present', | 35   $ensure = 'present', | 
| 36   $groups = [], | 36   $groups = [], | 
| 37   $password_hash = undef, | 37   $password_hash = undef, | 
| 38 ) { | 38 ) { | 
| 39 | 39 | 
| 40   include adblockplus | 40   include adblockplus | 
| 41   include users |  | 
| 42 | 41 | 
| 43   # Re-used multiple times below | 42   # Re-used multiple times below | 
| 44   $home = "/home/$name" | 43   $home = "/home/$name" | 
| 45 | 44 | 
| 46   user {$name: | 45   user {$name: | 
| 47     ensure => $ensure, | 46     ensure => $ensure, | 
| 48     groups => $groups, | 47     groups => $groups, | 
| 49     home => $home, | 48     home => $home, | 
| 50     managehome => true, | 49     managehome => true, | 
| 51     password => $password_hash, | 50     password => $password_hash, | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 63   } | 62   } | 
| 64 | 63 | 
| 65   file {"$home/.ssh/authorized_keys": | 64   file {"$home/.ssh/authorized_keys": | 
| 66     content => join($authorized_keys, "\n"), | 65     content => join($authorized_keys, "\n"), | 
| 67     ensure => $ensure, | 66     ensure => $ensure, | 
| 68     mode => 0644, | 67     mode => 0644, | 
| 69     owner => $name, | 68     owner => $name, | 
| 70     require => File["$home/.ssh"], | 69     require => File["$home/.ssh"], | 
| 71   } | 70   } | 
| 72 } | 71 } | 
| OLD | NEW | 
|---|