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

Delta Between Two Patch Sets: modules/notificationserver/manifests/init.pp

Issue 29329307: Issue 3211 - Integrate customservice::supervisor with notification daemon (Closed)
Left Patch Set: Created Oct. 20, 2015, 10:49 p.m.
Right Patch Set: Issue 3211 - Address feedback from codereview Created Oct. 26, 2015, 12:14 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « modules/customservice/manifests/supervisor.pp ('k') | modules/sitescripts/manifests/init.pp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 class notificationserver($is_default = false) { 1 class notificationserver($is_default = false) {
2 if !defined(Class['nginx']) { 2 if !defined(Class['nginx']) {
3 class {'nginx': 3 class {'nginx':
4 worker_connections => 4000, 4 worker_connections => 4000,
5 ssl_session_cache => off, 5 ssl_session_cache => off,
6 } 6 }
7 } 7 }
8 8
9 class {'sitescripts': 9 class {'sitescripts':
10 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni' 10 sitescriptsini_source => 'puppet:///modules/notificationserver/sitescripts.i ni'
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 include spawn-fcgi 31 include spawn-fcgi
32 package {'python-flup':} 32 package {'python-flup':}
33 33
34 spawn-fcgi::pool {'multiplexer': 34 spawn-fcgi::pool {'multiplexer':
35 ensure => present, 35 ensure => present,
36 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 36 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
37 socket => '/tmp/multiplexer-fastcgi.sock', 37 socket => '/tmp/multiplexer-fastcgi.sock',
38 mode => '0666', 38 mode => '0666',
39 order => 500,
39 user => 'nginx', 40 user => 'nginx',
40 children => 1, 41 children => 1,
41 require => [ 42 require => [
42 Exec['fetch_sitescripts'], 43 Exec['fetch_sitescripts'],
43 Exec['fetch_notifications'], 44 Exec['fetch_notifications'],
44 Package['python-flup'] 45 Package['python-flup']
45 ] 46 ]
47 }
48
49 customservice::supervisor {'spawn-fcgi':
50 pidfile => '/var/run/500-multiplexer_spawn-fcgi.pid',
46 } 51 }
47 52
48 File { 53 File {
49 owner => root, 54 owner => root,
50 group => root, 55 group => root,
51 mode => 0644, 56 mode => 0644,
52 } 57 }
53 58
54 nginx::hostconfig{'notification.adblockplus.org': 59 nginx::hostconfig{'notification.adblockplus.org':
55 source => 'puppet:///modules/notificationserver/site.conf', 60 source => 'puppet:///modules/notificationserver/site.conf',
56 global_config => template('notificationserver/global.conf.erb'), 61 global_config => template('notificationserver/global.conf.erb'),
57 is_default => $is_default, 62 is_default => $is_default,
58 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', 63 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem',
59 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', 64 private_key => 'easylist-downloads.adblockplus.org_sslcert.key',
60 log => 'access_log_notification', 65 log => 'access_log_notification',
61 log_format => 'notification', 66 log_format => 'notification',
62 } 67 }
63 } 68 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld