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

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

Issue 29448574: Noissue - Use of spawn_fcgi module instead of spawn-fcgi (Closed)
Patch Set: Created May 25, 2017, 4:55 p.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/notificationserver/manifests/init.pp ('k') | modules/updateserver/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 trac( 1 class trac(
2 $domain, 2 $domain,
3 $certificate, 3 $certificate,
4 $private_key, 4 $private_key,
5 $fcgi_config_dir = '/etc/nginx/trac.d', 5 $fcgi_config_dir = '/etc/nginx/trac.d',
6 $is_default = false) inherits private::trac { 6 $is_default = false) inherits private::trac {
7 7
8 package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']: 8 package {['python-mysqldb','python-pip','subversion', 'tofrodos', 'graphviz']:
9 ensure => present 9 ensure => present
10 } 10 }
11 11
12 include stdlib 12 include stdlib
13 include nginx 13 include nginx
14 include spawn-fcgi 14 include spawn_fcgi
15 15
16 file {$fcgi_config_dir: 16 file {$fcgi_config_dir:
17 ensure => directory, 17 ensure => directory,
18 owner => 'root', 18 owner => 'root',
19 mode => 755, 19 mode => 755,
20 require => Package['nginx'], 20 require => Package['nginx'],
21 } 21 }
22 22
23 nginx::hostconfig {$domain: 23 nginx::hostconfig {$domain:
24 content => "include $fcgi_config_dir/*;", 24 content => "include $fcgi_config_dir/*;",
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 require => Exec["deploy_$name"], 264 require => Exec["deploy_$name"],
265 } 265 }
266 266
267 file {"/home/trac/htdocs-$name/htdocs/common/logo.png": 267 file {"/home/trac/htdocs-$name/htdocs/common/logo.png":
268 ensure => present, 268 ensure => present,
269 source => $logo, 269 source => $logo,
270 owner => trac, 270 owner => trac,
271 require => Exec["deploy_$name"], 271 require => Exec["deploy_$name"],
272 } 272 }
273 273
274 spawn-fcgi::pool {"tracd_${name}": 274 spawn_fcgi::pool {"tracd_${name}":
275 ensure => present, 275 ensure => present,
276 fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi", 276 fcgi_app => "/home/trac/htdocs-$name/cgi-bin/trac.fcgi",
277 socket => "/tmp/${name}-fastcgi.sock", 277 socket => "/tmp/${name}-fastcgi.sock",
278 mode => "0666", 278 mode => "0666",
279 user => trac, 279 user => trac,
280 children => 1, 280 children => 1,
281 require => Exec["deploy_$name"], 281 require => Exec["deploy_$name"],
282 } 282 }
283 283
284 logrotate::config {"trac_$name": 284 logrotate::config {"trac_$name":
285 content => template('trac/logrotate.erb'), 285 content => template('trac/logrotate.erb'),
286 ensure => 'present', 286 ensure => 'present',
287 } 287 }
288 } 288 }
289 289
290 # Daily restart required for log rotation of all instances at once 290 # Daily restart required for log rotation of all instances at once
291 cron {'restart-trac-daily': 291 cron {'restart-trac-daily':
292 command => 'service spawn-fcgi restart >/tmp/spawn-fcgi-restart.log', 292 command => 'service spawn-fcgi restart >/tmp/spawn-fcgi-restart.log',
293 environment => hiera('cron::environment', []), 293 environment => hiera('cron::environment', []),
294 hour => '1', 294 hour => '1',
295 minute => '0', 295 minute => '0',
296 user => 'root', 296 user => 'root',
297 } 297 }
298 } 298 }
299 299
OLDNEW
« no previous file with comments | « modules/notificationserver/manifests/init.pp ('k') | modules/updateserver/manifests/init.pp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld