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

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

Issue 29366972: Issue 1503 - Remove hard-coded $MAILTO variable from updateserver cron environment (Closed)
Patch Set: Created Dec. 7, 2016, 7:49 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class updateserver( 1 class updateserver(
2 $domain, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $is_default=false 5 $is_default=false
6 ) { 6 ) {
7 class {'nginx': 7 class {'nginx':
8 worker_connections => 4000, 8 worker_connections => 4000,
9 ssl_session_cache => off, 9 ssl_session_cache => off,
10 } 10 }
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 timeout => 0, 123 timeout => 0,
124 require => [Class['sitescripts'], 124 require => [Class['sitescripts'],
125 Fetch_repository[$repositories_to_sync], 125 Fetch_repository[$repositories_to_sync],
126 File[$update_update_manifests_script], 126 File[$update_update_manifests_script],
127 File[$update_manifest_dirs], File[$safari_certificate_path], 127 File[$update_manifest_dirs], File[$safari_certificate_path],
128 Package['Jinja2', 'pycrypto']] 128 Package['Jinja2', 'pycrypto']]
129 } 129 }
130 130
131 cron {'update_update_manifests': 131 cron {'update_update_manifests':
132 ensure => present, 132 ensure => present,
133 environment => ['MAILTO=admins@adblockplus.org'],
134 command => $update_update_manifests_script, 133 command => $update_update_manifests_script,
135 user => 'sitescripts', 134 user => 'sitescripts',
136 minute => '*/10', 135 minute => '*/10',
137 require => Exec['update_update_manifests'] 136 require => Exec['update_update_manifests']
138 } 137 }
139 138
140 include spawn-fcgi 139 include spawn-fcgi
141 140
142 spawn-fcgi::pool {"multiplexer": 141 spawn-fcgi::pool {"multiplexer":
143 ensure => present, 142 ensure => present,
144 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 143 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
145 socket => '/tmp/multiplexer-fastcgi.sock', 144 socket => '/tmp/multiplexer-fastcgi.sock',
146 mode => '0666', 145 mode => '0666',
147 user => 'nginx', 146 user => 'nginx',
148 children => 1, 147 children => 1,
149 require => [ 148 require => [
150 Class["sitescripts"], 149 Class["sitescripts"],
151 ], 150 ],
152 } 151 }
153 } 152 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld