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

Side by Side Diff: modules/downloadserver/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
« no previous file with comments | « no previous file | modules/hgweb/manifests/init.pp » ('j') | modules/sitescripts/manifests/init.pp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 class downloadserver( 1 class downloadserver(
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 7
8 class {'nginx': 8 class {'nginx':
9 worker_connections => 4000, 9 worker_connections => 4000,
10 ssl_session_cache => off, 10 ssl_session_cache => off,
11 } 11 }
12 12
13 class {'sitescripts': 13 class {'sitescripts':
14 sitescriptsini_source => 'puppet:///modules/downloadserver/sitescripts', 14 sitescriptsini_source => 'puppet:///modules/downloadserver/sitescripts',
15 } 15 }
16 16
17 package {['python-flup', 'python-jinja2']:} 17 package {'python-jinja2':}
18 include spawn-fcgi 18 include spawn-fcgi
19 19
20 spawn-fcgi::pool {'multiplexer': 20 spawn-fcgi::pool {'multiplexer':
21 ensure => present, 21 ensure => present,
22 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 22 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
23 socket => '/tmp/multiplexer-fastcgi.sock', 23 socket => '/tmp/multiplexer-fastcgi.sock',
24 mode => '0666', 24 mode => '0666',
25 user => 'nginx', 25 user => 'nginx',
26 children => 1, 26 children => 1,
27 require => [ 27 require => [
28 Class['sitescripts'], 28 Class['sitescripts'],
29 Package['python-flup', 'python-jinja2'], 29 Package['python-jinja2'],
30 ], 30 ],
31 } 31 }
32 32
33 user {'hg': 33 user {'hg':
34 ensure => present, 34 ensure => present,
35 comment => 'Mercurial client user', 35 comment => 'Mercurial client user',
36 home => '/home/hg', 36 home => '/home/hg',
37 managehome => true 37 managehome => true
38 } 38 }
39 39
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 require => [File['/home/rsync/.ssh/known_hosts'], 124 require => [File['/home/rsync/.ssh/known_hosts'],
125 File['/home/rsync/.ssh/id_rsa'], 125 File['/home/rsync/.ssh/id_rsa'],
126 File['/var/www/devbuilds']], 126 File['/var/www/devbuilds']],
127 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds', 127 command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /va r/www/devbuilds',
128 environment => hiera('cron::environment', []), 128 environment => hiera('cron::environment', []),
129 user => rsync, 129 user => rsync,
130 hour => '*', 130 hour => '*',
131 minute => '4-54/10' 131 minute => '4-54/10'
132 } 132 }
133 } 133 }
OLDNEW
« no previous file with comments | « no previous file | modules/hgweb/manifests/init.pp » ('j') | modules/sitescripts/manifests/init.pp » ('J')

Powered by Google App Engine
This is Rietveld