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

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

Issue 29363535: Issue 2313 - Handle Flup dependency in module sitescripts (Closed)
Patch Set: Created Nov. 18, 2016, 9:47 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
OLDNEW
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 11 matching lines...) Expand all
22 22
23 cron {'update_notifications': 23 cron {'update_notifications':
24 command => 'hg pull -q -u -R /opt/notifications', 24 command => 'hg pull -q -u -R /opt/notifications',
25 environment => hiera('cron::environment', []), 25 environment => hiera('cron::environment', []),
26 minute => '*/5', 26 minute => '*/5',
27 user => 'nginx', 27 user => 'nginx',
28 require => Exec['fetch_notifications'], 28 require => Exec['fetch_notifications'],
29 } 29 }
30 30
31 include spawn-fcgi 31 include spawn-fcgi
32 package {'python-flup':}
33 32
34 spawn-fcgi::pool {'multiplexer': 33 spawn-fcgi::pool {'multiplexer':
35 ensure => present, 34 ensure => present,
36 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 35 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
37 socket => '/tmp/multiplexer-fastcgi.sock', 36 socket => '/tmp/multiplexer-fastcgi.sock',
38 mode => '0666', 37 mode => '0666',
39 order => 500, 38 order => 500,
40 user => 'nginx', 39 user => 'nginx',
41 children => 1, 40 children => 1,
42 require => [ 41 require => [
43 Class['sitescripts'], 42 Class['sitescripts'],
44 Exec['fetch_notifications'], 43 Exec['fetch_notifications'],
45 Package['python-flup']
46 ] 44 ]
47 } 45 }
48 46
49 customservice::supervisor {'spawn-fcgi': 47 customservice::supervisor {'spawn-fcgi':
50 pidfile => '/var/run/500-multiplexer_spawn-fcgi.pid', 48 pidfile => '/var/run/500-multiplexer_spawn-fcgi.pid',
51 } 49 }
52 50
53 File { 51 File {
54 owner => root, 52 owner => root,
55 group => root, 53 group => root,
56 mode => 0644, 54 mode => 0644,
57 } 55 }
58 56
59 nginx::hostconfig{'notification.adblockplus.org': 57 nginx::hostconfig{'notification.adblockplus.org':
60 source => 'puppet:///modules/notificationserver/site.conf', 58 source => 'puppet:///modules/notificationserver/site.conf',
61 global_config => template('notificationserver/global.conf.erb'), 59 global_config => template('notificationserver/global.conf.erb'),
62 is_default => $is_default, 60 is_default => $is_default,
63 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', 61 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem',
64 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', 62 private_key => 'easylist-downloads.adblockplus.org_sslcert.key',
65 log => 'access_log_notification', 63 log => 'access_log_notification',
66 log_format => 'notification', 64 log_format => 'notification',
67 } 65 }
68 } 66 }
OLDNEW

Powered by Google App Engine
This is Rietveld