coren has submitted this change and it was merged.
Change subject: beta: skip l10nupdate user/group creation
......................................................................
beta: skip l10nupdate user/group creation
I created a l10nupdate user on wikitech and Coren created a l10nupdate
group. Thus we do not need puppet to create them when on labs.
- changed: create home for LDAP account
- changed: fix dependencies accordingly
- spaces!
Bug: 62529
Bug: 62595
Change-Id: I005953dd65579893980a80f3e3341520a0281d18
---
M modules/mediawiki/manifests/users/l10nupdate.pp
1 file changed, 35 insertions(+), 18 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/manifests/users/l10nupdate.pp
b/modules/mediawiki/manifests/users/l10nupdate.pp
index cdb113d..3c04ddd 100644
--- a/modules/mediawiki/manifests/users/l10nupdate.pp
+++ b/modules/mediawiki/manifests/users/l10nupdate.pp
@@ -1,24 +1,41 @@
# mediawiki l10nupdate user
class mediawiki::users::l10nupdate {
- ## l10nupdate user
- $authorized_key = 'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAzcA/wB0uoU+XgiYN/scGczrAGuN99O8L7m8TviqxgX9s+RexhPtn8FHss1GKi8oxVO1V+ssABVb2q0fGza4wqrHOlZadcFEGjQhZ4IIfUwKUo78mKhQsUyTd5RYMR0KlcjB4UyWSDX5tFHK6FE7/tySNTX7Tihau7KZ9R0Ax//KySCG0skKyI1BK4Ufb82S8wohrktBO6W7lag0O2urh9dKI0gM8EuP666DGnaNBFzycKLPqLaURCeCdB6IiogLHiR21dyeHIIAN0zD6SUyTGH2ZNlZkX05hcFUEWcsWE49+Ve/rdfu1wWTDnourH/Xm3IBkhVGqskB+yp3Jkz2D3Q==
l10nupdate@fenari'
+ ## l10nupdate user
+ $authorized_key = 'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAzcA/wB0uoU+XgiYN/scGczrAGuN99O8L7m8TviqxgX9s+RexhPtn8FHss1GKi8oxVO1V+ssABVb2q0fGza4wqrHOlZadcFEGjQhZ4IIfUwKUo78mKhQsUyTd5RYMR0KlcjB4UyWSDX5tFHK6FE7/tySNTX7Tihau7KZ9R0Ax//KySCG0skKyI1BK4Ufb82S8wohrktBO6W7lag0O2urh9dKI0gM8EuP666DGnaNBFzycKLPqLaURCeCdB6IiogLHiR21dyeHIIAN0zD6SUyTGH2ZNlZkX05hcFUEWcsWE49+Ve/rdfu1wWTDnourH/Xm3IBkhVGqskB+yp3Jkz2D3Q==
l10nupdate@fenari'
- require groups::l10nupdate
+ # On labs l10nupdate user and group are already in LDAP
+ if $::realm != 'labs' {
+ require groups::l10nupdate
- generic::systemuser { 'l10nupdate': name => 'l10nupdate', home =>
'/home/l10nupdate', default_group => 10002, shell => '/bin/bash' }
+ generic::systemuser { 'l10nupdate':
+ name => 'l10nupdate',
+ home => '/home/l10nupdate',
+ uid => $uid,
+ default_group => 'l10nupdate',
+ shell => '/bin/bash',
+ before => '/home/l10nupdate/.ssh',
+ }
+ } else {
+ file { '/home/l10update':
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0750',
+ ensure => directory,
+ before => '/home/l10nupdate/.ssh',
+ }
+ }
- file {
- "/home/l10nupdate/.ssh":
- require => Generic::Systemuser["l10nupdate"],
- owner => l10nupdate,
- group => l10nupdate,
- mode => 0500,
- ensure => directory;
- "/home/l10nupdate/.ssh/authorized_keys":
- require => File["/home/l10nupdate/.ssh"],
- owner => l10nupdate,
- group => l10nupdate,
- mode => 0400,
- content => $authorized_key;
- }
+ file {
+ '/home/l10nupdate/.ssh':
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0500',
+ ensure => directory;
+ '/home/l10nupdate/.ssh/authorized_keys':
+ require => File['/home/l10nupdate/.ssh'],
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0400',
+ content => $authorized_key;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/118071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I005953dd65579893980a80f3e3341520a0281d18
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
