Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: modules/adblockplus/manifests/user.pp

Issue 29341151: Issue 4019 - Added "Edge" to platform choices in Issues tracker at issues1. (Closed)
Patch Set: Created May 10, 2016, 3:35 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « modules/adblockplus/manifests/sudo.pp ('k') | modules/adblockplus/templates/log/fluentd/default.conf.erb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/adblockplus/manifests/user.pp
===================================================================
--- a/modules/adblockplus/manifests/user.pp
+++ b/modules/adblockplus/manifests/user.pp
@@ -32,40 +32,17 @@
#
define adblockplus::user (
$authorized_keys = [],
- $ensure = 'present',
$groups = [],
$password_hash = undef,
) {
include adblockplus
+ include users
- # Re-used multiple times below
- $home = "/home/$name"
-
- user {$name:
- ensure => $ensure,
+ users::user {"adblockplus::user#$name":
+ authorized_keys => join($authorized_keys, "\n"),
groups => $groups,
- home => $home,
- managehome => true,
password => $password_hash,
- 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"],
+ user_name => $name,
}
}
« no previous file with comments | « modules/adblockplus/manifests/sudo.pp ('k') | modules/adblockplus/templates/log/fluentd/default.conf.erb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld