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

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

Issue 29482672: #2032 - Upgrade PIP/markdown package to version 2.6.8 (Closed)
Patch Set: Created July 7, 2017, 3:17 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 ensure => 'held', 52 ensure => 'held',
53 } 53 }
54 54
55 package {'Jinja2': 55 package {'Jinja2':
56 ensure => '2.8', 56 ensure => '2.8',
57 provider => 'pip', 57 provider => 'pip',
58 require => [Package['python-pip'], Package['python-jinja2']], 58 require => [Package['python-pip'], Package['python-jinja2']],
59 } 59 }
60 60
61 package {'markdown': 61 package {'markdown':
62 ensure => '2.6.6', 62 ensure => '2.6.8',
63 provider => 'pip', 63 provider => 'pip',
64 require => [Package['python-pip'], Package['python-markdown']], 64 require => [Package['python-pip'], Package['python-markdown']],
65 } 65 }
66 66
67 nginx::hostconfig {$vhost: 67 nginx::hostconfig {$vhost:
68 content => template('web/site.conf.erb'), 68 content => template('web/site.conf.erb'),
69 global_config => template('web/global.conf.erb'), 69 global_config => template('web/global.conf.erb'),
70 is_default => $is_default, 70 is_default => $is_default,
71 certificate => $certificate ? {'undef' => undef, default => $certificate}, 71 certificate => $certificate ? {'undef' => undef, default => $certificate},
72 private_key => $private_key ? {'undef' => undef, default => $private_key}, 72 private_key => $private_key ? {'undef' => undef, default => $private_key},
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ) 183 )
184 184
185 cron {'update_repo': 185 cron {'update_repo':
186 ensure => present, 186 ensure => present,
187 command => $update_webpage_cmd, 187 command => $update_webpage_cmd,
188 user => www, 188 user => www,
189 minute => '5-59/20', 189 minute => '5-59/20',
190 } 190 }
191 191
192 } 192 }
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