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/394585
to review the following change.
Change subject: Revert "user homes: Allow git to control +x for $HOME files"
......................................................................
Revert "user homes: Allow git to control +x for $HOME files"
This is causing back and forth things like
Notice:
/Stage[main]/Admin/Admin::Hashuser[ori]/Admin::User[ori]/File[/home/ori/.binned/ps_mem.py]/mode:
mode changed '0755' to '0644'
and then
Notice:
/Stage[main]/Admin/Admin::Hashuser[ori]/Admin::User[ori]/File[/home/ori/.binned/ps_mem.py]/mode:
mode changed '0644' to '0755'
This is probably related to the git repo on one of the puppetmasters and should
be fixed, but in the meantime, reverting.
This reverts commit 3d646df5e3aa96d94b7a7fda405e024542c79ab9.
Change-Id: Ie848c425e45352d3100beb61f932cbb14f1c984f
---
M modules/admin/manifests/user.pp
1 file changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/394585/1
diff --git a/modules/admin/manifests/user.pp b/modules/admin/manifests/user.pp
index e7f45f3..310d8f1 100644
--- a/modules/admin/manifests/user.pp
+++ b/modules/admin/manifests/user.pp
@@ -71,21 +71,18 @@
# 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',
- # 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],
+ sourceselect => 'first',
+ recurse => 'remote',
+ mode => '0644',
+ owner => $name,
+ group => $gid,
+ force => true,
+ require => User[$name],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/394585
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie848c425e45352d3100beb61f932cbb14f1c984f
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
