[MediaWiki-commits] [Gerrit] fundraising banner rotation tweaks - change (operations/puppet)

2013-04-02 Thread Jgreen (Code Review) 
Jgreen has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/57089


Change subject: fundraising banner rotation tweaks
..

fundraising banner rotation tweaks

Change-Id: If058e3c36677172386baa7d82531006cdf5f48a6
---
M manifests/misc/fundraising.pp
1 file changed, 15 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/89/57089/1

diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index b74fe61..80dfd92 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -445,25 +445,29 @@
 
 class misc::fundraising::udp2log_rotation {
 
-   include accounts::file_mover
+   #include accounts::file_mover
 
-   sudo_user { file_mover: privileges = ['ALL = NOPASSWD: 
/usr/bin/killall -HUP udp2log'] }
+   sudo_user { udp2log: privileges = ['ALL = NOPASSWD: /usr/bin/killall 
-HUP udp2log'] }
 
file {
'/usr/local/bin/rotate_fundraising_logs':
-   owner = file_mover,
-   group = file_mover,
+   owner = udp2log,
+   group = udp2log,
mode = 0554,
source = 
'puppet:///files/misc/scripts/rotate_fundraising_logs';
+   '/a/log/fundraising/logs/':
+   owner = udp2log,
+   group = udp2log,
+   mode = 0750;
}
 
-   cron {
-   'rotate_fundraising_logs':
-   user = file_mover,
-   minute = '*/15',
-   command = '/usr/local/bin/rotate_fundraising_logs',
-   ensure = present;
-   }
+   #cron {
+   #   'rotate_fundraising_logs':
+   #   user = udp2log,
+   #   minute = '*/15',
+   #   command = '/usr/local/bin/rotate_fundraising_logs',
+   #   ensure = present;
+   #}
 
#class { nfs::netapp::fr_archive: mountpoint = 
/a/squid/fundraising/logs/fr_archive }
class { nfs::netapp::fr_archive: mountpoint = 
/a/log/fundraising/logs/fr_archive }

-- 
To view, visit https://gerrit.wikimedia.org/r/57089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If058e3c36677172386baa7d82531006cdf5f48a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] fundraising banner rotation tweaks - change (operations/puppet)

2013-04-02 Thread Jgreen (Code Review) 
Jgreen has submitted this change and it was merged.

Change subject: fundraising banner rotation tweaks
..


fundraising banner rotation tweaks

Change-Id: If058e3c36677172386baa7d82531006cdf5f48a6
---
M manifests/misc/fundraising.pp
1 file changed, 15 insertions(+), 11 deletions(-)

Approvals:
  Jgreen: Verified; Looks good to me, approved



diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index b74fe61..80dfd92 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -445,25 +445,29 @@
 
 class misc::fundraising::udp2log_rotation {
 
-   include accounts::file_mover
+   #include accounts::file_mover
 
-   sudo_user { file_mover: privileges = ['ALL = NOPASSWD: 
/usr/bin/killall -HUP udp2log'] }
+   sudo_user { udp2log: privileges = ['ALL = NOPASSWD: /usr/bin/killall 
-HUP udp2log'] }
 
file {
'/usr/local/bin/rotate_fundraising_logs':
-   owner = file_mover,
-   group = file_mover,
+   owner = udp2log,
+   group = udp2log,
mode = 0554,
source = 
'puppet:///files/misc/scripts/rotate_fundraising_logs';
+   '/a/log/fundraising/logs/':
+   owner = udp2log,
+   group = udp2log,
+   mode = 0750;
}
 
-   cron {
-   'rotate_fundraising_logs':
-   user = file_mover,
-   minute = '*/15',
-   command = '/usr/local/bin/rotate_fundraising_logs',
-   ensure = present;
-   }
+   #cron {
+   #   'rotate_fundraising_logs':
+   #   user = udp2log,
+   #   minute = '*/15',
+   #   command = '/usr/local/bin/rotate_fundraising_logs',
+   #   ensure = present;
+   #}
 
#class { nfs::netapp::fr_archive: mountpoint = 
/a/squid/fundraising/logs/fr_archive }
class { nfs::netapp::fr_archive: mountpoint = 
/a/log/fundraising/logs/fr_archive }

-- 
To view, visit https://gerrit.wikimedia.org/r/57089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If058e3c36677172386baa7d82531006cdf5f48a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jgreen jgr...@wikimedia.org
Gerrit-Reviewer: Jgreen jgr...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits