Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214333
Change subject: admin: absent ssh keys & sudoers when empty
......................................................................
admin: absent ssh keys & sudoers when empty
ensure => absent the SSH userkey & sudoers fragment if the admin data
contains empty data for them. Effectively, this implements key/privilege
revoking.
Change-Id: I57a4554b1ad6bbb9c5fa1f41b43c4bb429bac623
---
M modules/admin/manifests/user.pp
1 file changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/214333/1
diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index 19362fb..08cdb9d 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -91,16 +91,21 @@
fail("${name} is not a valid ssh_keys array: ${ssh_keys}")
}
+ $ensure_ssh_keys = empty($ssh_keys) ?
+ true => absent,
+ false => $ensure,
+ }
ssh::userkey { $name:
- ensure => $ensure,
+ ensure => $ensure_ssh_keys,
content => join($ssh_keys, "\n"),
- tag => 'user-ssh',
}
- if !empty($privileges) {
- sudo::user { $name:
- ensure => $ensure,
- privileges => $privileges,
- }
+ $ensure_privileges = empty($privileges) ?
+ true => absent,
+ false => $ensure,
+ }
+ sudo::user { $name:
+ ensure => $ensure_privileges,
+ privileges => $privileges,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57a4554b1ad6bbb9c5fa1f41b43c4bb429bac623
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
