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

Side by Side Diff: modules/web/manifests/server.pp

Issue 6394253802471424: Issue 1374 - Don`t hardcode web handlers for multiplexer (Closed)
Patch Set: Created Sept. 15, 2014, 10:05 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 | « modules/updateserver/manifests/init.pp ('k') | 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 web::server( 1 class web::server(
2 $vhost, 2 $vhost,
3 $repository, 3 $repository,
4 $certificate, 4 $certificate,
5 $private_key, 5 $private_key,
6 $is_default = false, 6 $is_default = false,
7 $aliases = undef, 7 $aliases = undef,
8 $custom_config = undef, 8 $custom_config = undef,
9 $multiplexer_locations = undef) { 9 $multiplexer_locations = undef) {
10 File { 10 File {
(...skipping 18 matching lines...) Expand all
29 private_key => $private_key, 29 private_key => $private_key,
30 log => "access_log_$vhost" 30 log => "access_log_$vhost"
31 } 31 }
32 32
33 class {'sitescripts': 33 class {'sitescripts':
34 sitescriptsini_source => 'puppet:///modules/web/sitescripts', 34 sitescriptsini_source => 'puppet:///modules/web/sitescripts',
35 } 35 }
36 36
37 if $multiplexer_locations != undef { 37 if $multiplexer_locations != undef {
38 include spawn-fcgi 38 include spawn-fcgi
39 package {['python-flup', 'python-mysqldb']:} 39 package {'python-flup':}
40 40
41 spawn-fcgi::pool {"multiplexer": 41 spawn-fcgi::pool {"multiplexer":
42 ensure => present, 42 ensure => present,
43 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 43 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
44 socket => '/tmp/multiplexer-fastcgi.sock', 44 socket => '/tmp/multiplexer-fastcgi.sock',
45 mode => '0666', 45 mode => '0666',
46 user => 'nginx', 46 user => 'nginx',
47 children => 1, 47 children => 1,
48 require => [ 48 require => [
49 Exec["fetch_sitescripts"], 49 Exec["fetch_sitescripts"],
50 Package["python-flup"], 50 Package["python-flup"],
51 Package["python-mysqldb"],
52 ], 51 ],
53 } 52 }
54 } 53 }
55 54
56 user {'www': 55 user {'www':
57 ensure => present, 56 ensure => present,
58 comment => 'Web content owner', 57 comment => 'Web content owner',
59 home => '/home/www', 58 home => '/home/www',
60 managehome => true, 59 managehome => true,
61 } 60 }
(...skipping 18 matching lines...) Expand all
80 mode => 755, 79 mode => 755,
81 } 80 }
82 81
83 cron {'update_repo': 82 cron {'update_repo':
84 ensure => present, 83 ensure => present,
85 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}", 84 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}",
86 user => www, 85 user => www,
87 minute => '*/10', 86 minute => '*/10',
88 } 87 }
89 } 88 }
OLDNEW
« no previous file with comments | « modules/updateserver/manifests/init.pp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld