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" |