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

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

Issue 29531703: #3197 - Use of hash for parameters in legacy website (Closed)
Patch Set: For comment 2 Created Aug. 31, 2017, 12:16 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/adblockplus/manifests/legacy/webserver.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 $remote = "https://hg.adblockplus.org/${repository}",
5 $certificate = hiera('web::server::certificate', 'undef'), 4 $certificate = hiera('web::server::certificate', 'undef'),
6 $private_key = hiera('web::server::private_key', 'undef'), 5 $private_key = hiera('web::server::private_key', 'undef'),
7 $is_default = false, 6 $is_default = false,
8 $aliases = undef, 7 $aliases = undef,
9 $custom_config = undef, 8 $custom_config = undef,
10 $multiplexer_locations = undef, 9 $multiplexer_locations = undef,
11 $geoip = false, 10 $geoip = false,
12 ) { 11 ) {
13 12
14 include sitescripts 13 include sitescripts
15 include adblockplus::web 14 include adblockplus::web
16 15
16 $remote = hiera('web::server::remote', "https://hg.adblockplus.org/${repositor y}")
17
17 $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts' 18 $pythonpath = 'PYTHONPATH=/opt/cms:/opt/sitescripts'
18 19
19 # Ensure there is at least one character in the respective strings; 20 # Ensure there is at least one character in the respective strings;
20 # see https://codereview.adblockplus.org/29329028/#msg3 21 # see https://codereview.adblockplus.org/29329028/#msg3
21 validate_re($vhost, '.+') 22 validate_re($vhost, '.+')
22 validate_re($repository, '.+') 23 validate_re($repository, '.+')
23 24
24 File { 25 File {
25 owner => 'root', 26 owner => 'root',
26 group => 'root', 27 group => 'root',
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 ) 185 )
185 186
186 cron {'update_repo': 187 cron {'update_repo':
187 ensure => present, 188 ensure => present,
188 command => $update_webpage_cmd, 189 command => $update_webpage_cmd,
189 user => www, 190 user => www,
190 minute => '5-59/20', 191 minute => '5-59/20',
191 } 192 }
192 193
193 } 194 }
OLDNEW
« no previous file with comments | « modules/adblockplus/manifests/legacy/webserver.pp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld