Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/notificationserver/manifests/init.pp

Issue 11548101: Send all cron mail both to admins and the local root user (Closed)
Patch Set: Created Sept. 2, 2013, 9:21 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/logrotate/manifests/init.pp ('k') | modules/sitescripts/manifests/init.pp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class notificationserver { 1 class notificationserver {
2 class {'nginx': 2 class {'nginx':
3 worker_processes => 2, 3 worker_processes => 2,
4 worker_connections => 4000, 4 worker_connections => 4000,
5 ssl_session_cache => off, 5 ssl_session_cache => off,
6 } 6 }
7 7
8 class {'statsclient': 8 class {'statsclient':
9 log_path => '/var/log/nginx/access_log_notification.1.gz', 9 log_path => '/var/log/nginx/access_log_notification.1.gz',
10 custom_sitescriptsini_source => 'puppet:///modules/notificationserver/sitesc ripts.ini' 10 custom_sitescriptsini_source => 'puppet:///modules/notificationserver/sitesc ripts.ini'
(...skipping 16 matching lines...) Expand all
27 exec { "fetch_notifications": 27 exec { "fetch_notifications":
28 command => "hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications", 28 command => "hg clone --noupdate https://hg.adblockplus.org/notifications /op t/notifications && chown -R nginx /opt/notifications",
29 path => ["/usr/bin/", "/bin/"], 29 path => ["/usr/bin/", "/bin/"],
30 require => Package['mercurial'], 30 require => Package['mercurial'],
31 onlyif => "test ! -d /opt/notifications" 31 onlyif => "test ! -d /opt/notifications"
32 } 32 }
33 33
34 cron {"update_notifications": 34 cron {"update_notifications":
35 ensure => present, 35 ensure => present,
36 command => "python -m sitescripts.management.bin.generateNotifications", 36 command => "python -m sitescripts.management.bin.generateNotifications",
37 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], 37 environment => ['MAILTO=admins@adblockplus.org,root', 'PYTHONPATH=/opt/sites cripts'],
38 user => nginx, 38 user => nginx,
39 minute => '*/10', 39 minute => '*/10',
40 require => [ 40 require => [
41 Exec["fetch_notifications"], 41 Exec["fetch_notifications"],
42 Exec["fetch_sitescripts"] 42 Exec["fetch_sitescripts"]
43 ], 43 ],
44 } 44 }
45 45
46 File { 46 File {
47 owner => root, 47 owner => root,
(...skipping 22 matching lines...) Expand all
70 enabled => true 70 enabled => true
71 } 71 }
72 72
73 file {'/etc/logrotate.d/nginx_notification.adblockplus.org': 73 file {'/etc/logrotate.d/nginx_notification.adblockplus.org':
74 ensure => file, 74 ensure => file,
75 mode => 0444, 75 mode => 0444,
76 require => Nginx::Hostconfig['notification.adblockplus.org'], 76 require => Nginx::Hostconfig['notification.adblockplus.org'],
77 source => 'puppet:///modules/notificationserver/logrotate' 77 source => 'puppet:///modules/notificationserver/logrotate'
78 } 78 }
79 } 79 }
OLDNEW
« no previous file with comments | « modules/logrotate/manifests/init.pp ('k') | modules/sitescripts/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld