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

Unified Diff: modules/web/manifests/server.pp

Issue 29340860: Issue 3996 - Make sure to install current versions of Markdown and Jinja2 modules on web servers (Closed)
Patch Set: Created April 27, 2016, 12:26 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: modules/web/manifests/server.pp
===================================================================
--- a/modules/web/manifests/server.pp
+++ b/modules/web/manifests/server.pp
@@ -36,17 +36,25 @@ class web::server(
},
}
class {'geoip':
cron => {hour => 0, minute => 8, monthday => 15},
ensure => $geoip ? {false => 'absent', default => 'present'},
}
- package {['python-jinja2', 'python-markdown']:}
+ package {'python-pip':
mathias 2016/04/27 12:35:28 Please use ensure_packages() instead of an explici
Wladimir Palant 2016/04/27 13:00:43 Done.
+ ensure => 'present',
+ }
+
+ package {['Jinja2', 'markdown']:
+ ensure => 'present',
mathias 2016/04/27 12:35:28 In order to improve consistency between environmen
Wladimir Palant 2016/04/27 13:00:43 Done. Note that there seems to be an ugly side-eff
mathias 2016/04/27 13:21:27 Acknowledged.
+ provider => 'pip',
+ require => Package['python-pip'],
+ }
nginx::hostconfig {$vhost:
content => template('web/site.conf.erb'),
global_config => template('web/global.conf.erb'),
is_default => $is_default,
certificate => $certificate ? {'undef' => undef, default => $certificate},
private_key => $private_key ? {'undef' => undef, default => $private_key},
log => "access_log_$vhost"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld