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

Side by Side Diff: modules/downloadserver/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 | « no previous file | modules/filterserver/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 downloadserver { 1 class downloadserver {
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_downloads.1.gz', 9 log_path => '/var/log/nginx/access_log_downloads.1.gz',
10 } 10 }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 file {'/etc/logrotate.d/nginx_downloads.adblockplus.org': 61 file {'/etc/logrotate.d/nginx_downloads.adblockplus.org':
62 ensure => file, 62 ensure => file,
63 mode => 0444, 63 mode => 0444,
64 require => Nginx::Hostconfig['downloads.adblockplus.org'], 64 require => Nginx::Hostconfig['downloads.adblockplus.org'],
65 source => 'puppet:///modules/downloadserver/logrotate' 65 source => 'puppet:///modules/downloadserver/logrotate'
66 } 66 }
67 67
68 cron {'mirror': 68 cron {'mirror':
69 ensure => present, 69 ensure => present,
70 command => 'hg pull -q -u -R /var/www/downloads/', 70 command => 'hg pull -q -u -R /var/www/downloads/',
71 environment => ['MAILTO=admins@adblockplus.org,root'],
71 user => hg, 72 user => hg,
72 minute => '*/10' 73 minute => '*/10'
73 } 74 }
74 75
75 file {'/var/www/devbuilds': 76 file {'/var/www/devbuilds':
76 ensure => directory, 77 ensure => directory,
77 owner => rsync 78 owner => rsync
78 } 79 }
79 80
80 user {'rsync': 81 user {'rsync':
(...skipping 29 matching lines...) Expand all
110 mode => 0400, 111 mode => 0400,
111 source => 'puppet:///modules/private/rsync@downloads.adblockplus.org.pub' 112 source => 'puppet:///modules/private/rsync@downloads.adblockplus.org.pub'
112 } 113 }
113 114
114 cron {'mirror-devbuilds': 115 cron {'mirror-devbuilds':
115 ensure => present, 116 ensure => present,
116 require => [File['/home/rsync/.ssh/known_hosts'], 117 require => [File['/home/rsync/.ssh/known_hosts'],
117 File['/home/rsync/.ssh/id_rsa'], 118 File['/home/rsync/.ssh/id_rsa'],
118 File['/var/www/devbuilds']], 119 File['/var/www/devbuilds']],
119 command => 'rsync -e ssh -ltprz devbuilds@ssh.adblockplus.org:. /var/www/dev builds', 120 command => 'rsync -e ssh -ltprz devbuilds@ssh.adblockplus.org:. /var/www/dev builds',
121 environment => ['MAILTO=admins@adblockplus.org,root'],
120 user => rsync, 122 user => rsync,
121 hour => '*', 123 hour => '*',
122 minute => '4-54/10' 124 minute => '4-54/10'
123 } 125 }
124 } 126 }
OLDNEW
« no previous file with comments | « no previous file | modules/filterserver/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld