Jgreen has submitted this change and it was merged.
Change subject: assign uid/gid 30001/30001 to file_mover, switch banner
logrotation user
......................................................................
assign uid/gid 30001/30001 to file_mover, switch banner logrotation user
Change-Id: I238ec6fff8f31d463d9cb1f50b1d22c15c650cd2
---
M manifests/admins.pp
M manifests/misc/fundraising.pp
2 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Jgreen: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/admins.pp b/manifests/admins.pp
index ecefcb5..0043d91 100644
--- a/manifests/admins.pp
+++ b/manifests/admins.pp
@@ -80,9 +80,11 @@
# to move udp2log fundraising logs around.
class file_mover {
group { 'file_mover':
- name => 'file_mover',
- ensure => present,
- allowdupe => false,
+ name => 'file_mover',
+ gid => 30001,
+ alias => 30001,
+ ensure => present,
+ allowdupe => false,
}
}
}
@@ -1503,7 +1505,7 @@
class file_mover inherits baseaccount {
$username = "file_mover"
$realname = "file_mover"
- $uid = 10001
+ $uid = 30001
include groups::file_mover
unixaccount { $realname: username => $username, uid => $uid,
gid => 'file_mover', require => Class['groups::file_mover'] }
diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index d537cd5..4e9bc53 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -415,7 +415,7 @@
#include accounts::file_mover
- sudo_user { "udp2log": privileges => ['ALL = NOPASSWD: /usr/bin/killall
-HUP udp2log'] }
+ sudo_user { "file_mover": privileges => ['ALL = NOPASSWD:
/usr/bin/killall -HUP udp2log'] }
file {
'/usr/local/bin/rotate_fundraising_logs':
@@ -425,8 +425,8 @@
source =>
'puppet:///files/misc/scripts/rotate_fundraising_logs';
'/a/log/fundraising/logs/buffer':
ensure => directory,
- owner => udp2log,
- group => udp2log,
+ owner => file_mover,
+ group => wikidev,
mode => 0750;
}
--
To view, visit https://gerrit.wikimedia.org/r/59835
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I238ec6fff8f31d463d9cb1f50b1d22c15c650cd2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
