Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365891 )
Change subject: Change $deploy_user home directory to /var/lib/${deploy_user}
......................................................................
Change $deploy_user home directory to /var/lib/${deploy_user}
This probably should not be hard-coded to /var/lib/scap?
This only really causes a problem on deployment-prep because
the mwdeploy user is in ldap so puppet can't change the home
directory to /var/lib/scap. I think this is more correct though
and it also happens to fix T166013 on beta.
Bug: T166013
Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d
---
M modules/scap/manifests/target.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, but someone else must approve
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Gilles: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
diff --git a/modules/scap/manifests/target.pp b/modules/scap/manifests/target.pp
index 00a9955..1f2d582 100644
--- a/modules/scap/manifests/target.pp
+++ b/modules/scap/manifests/target.pp
@@ -72,10 +72,12 @@
user { $deploy_user:
ensure => present,
shell => '/bin/bash',
- home => '/var/lib/scap',
+ home => "/var/lib/${deploy_user}",
system => true,
managehome => true,
}
+ } else {
+ notice("manage_user=true but user ${deploy_user} already defined")
}
if !defined(Ssh::Userkey[$deploy_user]) {
$key_name_safe = regsubst($key_name, '\W', '_', 'G')
--
To view, visit https://gerrit.wikimedia.org/r/365891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28402371379b2b9f7e9ee05dd89af17d9afae71d
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
