| 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 28 matching lines...) Expand all  Loading... | 
| 39       false => undef, | 39       false => undef, | 
| 40       default => '/usr/share/GeoIP/GeoIPv6.dat', | 40       default => '/usr/share/GeoIP/GeoIPv6.dat', | 
| 41     }, | 41     }, | 
| 42   } | 42   } | 
| 43 | 43 | 
| 44   class {'geoip': | 44   class {'geoip': | 
| 45     cron => {hour => 0, minute => 8, monthday => 15}, | 45     cron => {hour => 0, minute => 8, monthday => 15}, | 
| 46     ensure => $geoip ? {false => 'absent', default => 'present'}, | 46     ensure => $geoip ? {false => 'absent', default => 'present'}, | 
| 47   } | 47   } | 
| 48 | 48 | 
| 49   ensure_packages(['python-pip']) |  | 
| 50 |  | 
| 51   # Make sure that apt packages corresponding to the pip-installed modules below | 49   # Make sure that apt packages corresponding to the pip-installed modules below | 
| 52   # won't be installed unintentionally, these will take precedence otherwise. | 50   # won't be installed unintentionally, these will take precedence otherwise. | 
| 53   package {['python-jinja2', 'python-markdown']: | 51   package {['python-jinja2', 'python-markdown']: | 
| 54     ensure => 'held', | 52     ensure => 'held', | 
| 55   } | 53   } | 
| 56 | 54 | 
| 57   package {'Jinja2': | 55   package {'Jinja2': | 
| 58     ensure => '2.8', | 56     ensure => '2.8', | 
| 59     provider => 'pip', | 57     provider => 'pip', | 
| 60     require => [Package['python-pip'], Package['python-jinja2']], | 58     require => [Package['python-pip'], Package['python-jinja2']], | 
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 181   ) | 179   ) | 
| 182 | 180 | 
| 183   cron {'update_repo': | 181   cron {'update_repo': | 
| 184     ensure => present, | 182     ensure => present, | 
| 185     command => $update_webpage_cmd, | 183     command => $update_webpage_cmd, | 
| 186     user => www, | 184     user => www, | 
| 187     minute  => '5-59/20', | 185     minute  => '5-59/20', | 
| 188   } | 186   } | 
| 189 | 187 | 
| 190 } | 188 } | 
| OLD | NEW | 
|---|