| OLD | NEW |
| 1 # == Class: adblockplus::log::master | 1 # == Class: adblockplus::log::master |
| 2 # | 2 # |
| 3 # A server setup to collect and pre-process (i.e. anonymize and combine) | 3 # A server setup to collect and pre-process (i.e. anonymize and combine) |
| 4 # log files using Logstash (https://logstash.net/) pipelines. | 4 # log files using Logstash (https://logstash.net/) pipelines. |
| 5 # | 5 # |
| 6 class adblockplus::log::master { | 6 class adblockplus::log::master { |
| 7 | 7 |
| 8 include adblockplus | 8 include adblockplus |
| 9 realize(File['/var/adblockplus']) | 9 realize(File[$adblockplus::directory]) |
| 10 | 10 |
| 11 # Mapping hiera values explicitly becomes obsolete with Puppet 3.x | 11 # Mapping hiera values explicitly becomes obsolete with Puppet 3.x |
| 12 class {'logstash': | 12 class {'logstash': |
| 13 contrib => hiera('logstash::contrib', false), | 13 contrib => hiera('logstash::contrib', false), |
| 14 ensure => hiera('logstash::ensure', 'running'), | 14 ensure => hiera('logstash::ensure', 'running'), |
| 15 pipelines => hiera('logstash::pipelines', {}), | 15 pipelines => hiera('logstash::pipelines', {}), |
| 16 version => hiera('logstash::version', '1.4'), | 16 version => hiera('logstash::version', '1.4'), |
| 17 } | 17 } |
| 18 | 18 |
| 19 # Default location for output files in Logstash pipeline configurations | 19 # Default location for output files in Logstash pipeline configurations |
| 20 file {'/var/adblockplus/log': | 20 file {"$adblockplus::directory/log": |
| 21 before => Service['logstash'], | 21 before => Service['logstash'], |
| 22 group => 'logstash', | 22 group => 'logstash', |
| 23 mode => 0775, | 23 mode => 0775, |
| 24 require => [ | 24 require => [ |
| 25 File['/var/adblockplus'], | 25 File[$adblockplus::directory], |
| 26 Package['logstash'], | 26 Package['logstash'], |
| 27 ], | 27 ], |
| 28 } | 28 } |
| 29 } | 29 } |
| OLD | NEW |