Hello Faidon Liambotis, Alex Monk, Muehlenhoff, BryanDavis, Addshore,
jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/394586
to review the following change.
Change subject: Revert "Revert "user homes: Allow git to control +x for $HOME
files""
......................................................................
Revert "Revert "user homes: Allow git to control +x for $HOME files""
Only to be merged once issues described in
f1ca73f0f976eb57575180c90f1565fda235a248 have been resolved
This reverts commit f1ca73f0f976eb57575180c90f1565fda235a248.
Change-Id: Id7f540f6ee1b5b425edc0dc593f231344a4a8955
---
M modules/admin/manifests/user.pp
1 file changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/394586/1
diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index 310d8f1..e7f45f3 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -71,18 +71,21 @@
# Puppet chokes if we try to absent subfiles to /home/${user}
if $ensure == 'present' {
file { "/home/${name}":
- ensure => ensure_directory($ensure),
- source => [
+ ensure => ensure_directory($ensure),
+ source => [
"puppet:///modules/admin/home/${name}/",
'puppet:///modules/admin/home/skel/',
],
- sourceselect => 'first',
- recurse => 'remote',
- mode => '0644',
- owner => $name,
- group => $gid,
- force => true,
- require => User[$name],
+ sourceselect => 'first',
+ recurse => 'remote',
+ # Use source_permissions so that +x bit from git will be applied
+ # on the files when they are provisioned on hosts.
+ source_permissions => 'use',
+ mode => undef,
+ owner => $name,
+ group => $gid,
+ force => true,
+ require => User[$name],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/394586
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7f540f6ee1b5b425edc0dc593f231344a4a8955
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
