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

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

Issue 29337897: Issue 3686 - Replace sitescripts exec- with class-reference in class web::server (Closed)
Patch Set: Created March 6, 2016, 11:21 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 | « no previous file | 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 = hiera('web::server::certificate', 'undef'), 4 $certificate = hiera('web::server::certificate', 'undef'),
5 $private_key = hiera('web::server::private_key', 'undef'), 5 $private_key = hiera('web::server::private_key', 'undef'),
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 $geoip = false, 10 $geoip = false,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 } 59 }
60 60
61 spawn-fcgi::pool {"multiplexer": 61 spawn-fcgi::pool {"multiplexer":
62 ensure => present, 62 ensure => present,
63 fcgi_app => '/opt/sitescripts/multiplexer.fcgi', 63 fcgi_app => '/opt/sitescripts/multiplexer.fcgi',
64 socket => '/tmp/multiplexer-fastcgi.sock', 64 socket => '/tmp/multiplexer-fastcgi.sock',
65 mode => '0666', 65 mode => '0666',
66 user => 'nginx', 66 user => 'nginx',
67 children => 1, 67 children => 1,
68 require => [ 68 require => [
69 Exec["fetch_sitescripts"], 69 Class["sitescripts"],
70 Package["python-flup"], 70 Package["python-flup"],
71 ], 71 ],
72 } 72 }
73 } 73 }
74 74
75 user {'www': 75 user {'www':
76 ensure => present, 76 ensure => present,
77 comment => 'Web content owner', 77 comment => 'Web content owner',
78 home => '/home/www', 78 home => '/home/www',
79 managehome => true, 79 managehome => true,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 path => ['/usr/bin/'], 145 path => ['/usr/bin/'],
146 require => Package['nodejs'], 146 require => Package['nodejs'],
147 onlyif => 'test ! -x /usr/bin/jsdoc', 147 onlyif => 'test ! -x /usr/bin/jsdoc',
148 } 148 }
149 149
150 package {['make', 'doxygen']:} 150 package {['make', 'doxygen']:}
151 151
152 cron {'generate_docs': 152 cron {'generate_docs':
153 ensure => present, 153 ensure => present,
154 require => [ 154 require => [
155 Exec['fetch_sitescripts', 'install_jsdoc'], 155 Class['sitescripts'],
156 Exec['install_jsdoc'],
156 Package['make', 'doxygen'], 157 Package['make', 'doxygen'],
157 File['/var/www/docs'], 158 File['/var/www/docs'],
158 ], 159 ],
159 command => 'python -m sitescripts.docs.bin.generate_docs', 160 command => 'python -m sitescripts.docs.bin.generate_docs',
160 user => www, 161 user => www,
161 minute => '5-55/10', 162 minute => '5-55/10',
162 } 163 }
163 } 164 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld