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 ensure_packages(['python-pip']) |
| 45 |
| 46 # Make sure that apt packages corresponding to the pip-installed modules below |
| 47 # aren't present, these will take precedence otherwise. |
| 48 package {['python-jinja2', 'python-markdown']: |
| 49 ensure => purged |
| 50 } |
| 51 |
| 52 package {'Jinja2': |
| 53 ensure => '2.8', |
| 54 provider => 'pip', |
| 55 require => [Package['python-pip'], Package['python-jinja2']], |
| 56 } |
| 57 |
| 58 package {'markdown': |
| 59 ensure => '2.6.6', |
| 60 provider => 'pip', |
| 61 require => [Package['python-pip'], Package['python-markdown']], |
| 62 } |
45 | 63 |
46 nginx::hostconfig {$vhost: | 64 nginx::hostconfig {$vhost: |
47 content => template('web/site.conf.erb'), | 65 content => template('web/site.conf.erb'), |
48 global_config => template('web/global.conf.erb'), | 66 global_config => template('web/global.conf.erb'), |
49 is_default => $is_default, | 67 is_default => $is_default, |
50 certificate => $certificate ? {'undef' => undef, default => $certificate}, | 68 certificate => $certificate ? {'undef' => undef, default => $certificate}, |
51 private_key => $private_key ? {'undef' => undef, default => $private_key}, | 69 private_key => $private_key ? {'undef' => undef, default => $private_key}, |
52 log => "access_log_$vhost" | 70 log => "access_log_$vhost" |
53 } | 71 } |
54 | 72 |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
157 Class['sitescripts'], | 175 Class['sitescripts'], |
158 Exec['install_jsdoc'], | 176 Exec['install_jsdoc'], |
159 Package['make', 'doxygen'], | 177 Package['make', 'doxygen'], |
160 File['/var/www/docs'], | 178 File['/var/www/docs'], |
161 ], | 179 ], |
162 command => 'python -m sitescripts.docs.bin.generate_docs', | 180 command => 'python -m sitescripts.docs.bin.generate_docs', |
163 user => www, | 181 user => www, |
164 minute => '5-55/10', | 182 minute => '5-55/10', |
165 } | 183 } |
166 } | 184 } |
OLD | NEW |