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

Delta Between Two Patch Sets: modules/web/manifests/server.pp

Issue 29340860: Issue 3996 - Make sure to install current versions of Markdown and Jinja2 modules on web servers (Closed)
Left Patch Set: Addressed comments Created April 27, 2016, 1 p.m.
Right Patch Set: Hold apt packages rather than purge Created April 27, 2016, 1:51 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 25 matching lines...) Expand all
36 }, 36 },
37 } 37 }
38 38
39 class {'geoip': 39 class {'geoip':
40 cron => {hour => 0, minute => 8, monthday => 15}, 40 cron => {hour => 0, minute => 8, monthday => 15},
41 ensure => $geoip ? {false => 'absent', default => 'present'}, 41 ensure => $geoip ? {false => 'absent', default => 'present'},
42 } 42 }
43 43
44 ensure_packages(['python-pip']) 44 ensure_packages(['python-pip'])
45 45
46 # Make sure that apt packages corresponding to the pip-installed modules below
47 # won't be installed unintentionally, these will take precedence otherwise.
48 package {['python-jinja2', 'python-markdown']:
49 ensure => 'held',
50 }
51
46 package {'Jinja2': 52 package {'Jinja2':
47 ensure => '2.8', 53 ensure => '2.8',
48 provider => 'pip', 54 provider => 'pip',
49 require => Package['python-pip'], 55 require => [Package['python-pip'], Package['python-jinja2']],
50 } 56 }
51 57
52 package {'markdown': 58 package {'markdown':
53 ensure => '2.6.6', 59 ensure => '2.6.6',
54 provider => 'pip', 60 provider => 'pip',
55 require => Package['python-pip'], 61 require => [Package['python-pip'], Package['python-markdown']],
56 } 62 }
57 63
58 nginx::hostconfig {$vhost: 64 nginx::hostconfig {$vhost:
59 content => template('web/site.conf.erb'), 65 content => template('web/site.conf.erb'),
60 global_config => template('web/global.conf.erb'), 66 global_config => template('web/global.conf.erb'),
61 is_default => $is_default, 67 is_default => $is_default,
62 certificate => $certificate ? {'undef' => undef, default => $certificate}, 68 certificate => $certificate ? {'undef' => undef, default => $certificate},
63 private_key => $private_key ? {'undef' => undef, default => $private_key}, 69 private_key => $private_key ? {'undef' => undef, default => $private_key},
64 log => "access_log_$vhost" 70 log => "access_log_$vhost"
65 } 71 }
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 Class['sitescripts'], 175 Class['sitescripts'],
170 Exec['install_jsdoc'], 176 Exec['install_jsdoc'],
171 Package['make', 'doxygen'], 177 Package['make', 'doxygen'],
172 File['/var/www/docs'], 178 File['/var/www/docs'],
173 ], 179 ],
174 command => 'python -m sitescripts.docs.bin.generate_docs', 180 command => 'python -m sitescripts.docs.bin.generate_docs',
175 user => www, 181 user => www,
176 minute => '5-55/10', 182 minute => '5-55/10',
177 } 183 }
178 } 184 }
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld