 Issue 29340860:
  Issue 3996 - Make sure to install current versions of Markdown and Jinja2 modules on web servers  (Closed)
    
  
    Issue 29340860:
  Issue 3996 - Make sure to install current versions of Markdown and Jinja2 modules on web servers  (Closed) 
  | Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| 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 23 matching lines...) Expand all Loading... | |
| 34 false => undef, | 34 false => undef, | 
| 35 default => '/usr/share/GeoIP/GeoIPv6.dat', | 35 default => '/usr/share/GeoIP/GeoIPv6.dat', | 
| 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 package {['python-jinja2', 'python-markdown']:} | 44 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.
 | |
| 45 ensure => 'present', | |
| 46 } | |
| 47 | |
| 48 package {['Jinja2', 'markdown']: | |
| 49 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.
 | |
| 50 provider => 'pip', | |
| 51 require => Package['python-pip'], | |
| 52 } | |
| 45 | 53 | 
| 46 nginx::hostconfig {$vhost: | 54 nginx::hostconfig {$vhost: | 
| 47 content => template('web/site.conf.erb'), | 55 content => template('web/site.conf.erb'), | 
| 48 global_config => template('web/global.conf.erb'), | 56 global_config => template('web/global.conf.erb'), | 
| 49 is_default => $is_default, | 57 is_default => $is_default, | 
| 50 certificate => $certificate ? {'undef' => undef, default => $certificate}, | 58 certificate => $certificate ? {'undef' => undef, default => $certificate}, | 
| 51 private_key => $private_key ? {'undef' => undef, default => $private_key}, | 59 private_key => $private_key ? {'undef' => undef, default => $private_key}, | 
| 52 log => "access_log_$vhost" | 60 log => "access_log_$vhost" | 
| 53 } | 61 } | 
| 54 | 62 | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 Class['sitescripts'], | 165 Class['sitescripts'], | 
| 158 Exec['install_jsdoc'], | 166 Exec['install_jsdoc'], | 
| 159 Package['make', 'doxygen'], | 167 Package['make', 'doxygen'], | 
| 160 File['/var/www/docs'], | 168 File['/var/www/docs'], | 
| 161 ], | 169 ], | 
| 162 command => 'python -m sitescripts.docs.bin.generate_docs', | 170 command => 'python -m sitescripts.docs.bin.generate_docs', | 
| 163 user => www, | 171 user => www, | 
| 164 minute => '5-55/10', | 172 minute => '5-55/10', | 
| 165 } | 173 } | 
| 166 } | 174 } | 
| OLD | NEW |