Issue 4019 - Added "Edge" to platform choices in Issues tracker at issues1.

modules/adblockplus/manifests/log.pp

Index: modules/adblockplus/manifests/log.pp
===================================================================
--- a/modules/adblockplus/manifests/log.pp
+++ b/modules/adblockplus/manifests/log.pp
@@ -4,96 +4,42 @@
 #
 # === Parameters:
 #
-# [*ensure*]
-#   Whether associated resources are ment to be 'present' or 'absent'.
-#
-# [*name*]
-#   Used as label to connect adblockplus::log::tracker instances to class
-#   adblockplus::log::forwarder, defaults to 'adblockplus::log'.
-#
 # [*rotations*]
 #   A hash of adblockplus::log::rotation $name => $parameter items
 #   to set up in this context, i.e. via Hiera.
 #
-# [*trackers*]
-#   A hash of adblockplus::log::rotation $title => $parameter items
-#   to set up in this context, i.e. via Hiera.
-#
 # === Examples:
 #
 #   class {'adblockplus::log':
 #     rotations => {
 #       # see adblockplus::log::rotation
 #     },
-#     trackers => {
-#       # see adblockplus::log::tracker
-#     },
 #   }
 #
 class adblockplus::log (
-  $ensure = 'present',
   $rotations = hiera('adblockplus::log::rotations', {}),
-  $trackers = hiera('adblockplus::log::trackers', {}),
 ) {
 
   include adblockplus
-  include stdlib
+  realize(File[$adblockplus::directory])
 
   # Used as internal constants within adblockplus::log::* resources
-  $directory = "$adblockplus::directory/log/data"
+  $directory = "$adblockplus::directory/log"
+  $group = 'log'
   $user = 'log'
 
-  # Required on both log generating and log processing hosts
-  class {'fluent':
-    package => {
-      ensure =>  $ensure ? {
-        'present' => '2.3.1-0',
-        default => 'absent',
-      },
-      provider => 'apt',
-    },
-    user => {
-      groups => ['adm'],
-      shell => '/bin/sh',
-    },
-  }
-
-  # Used as internal shortcuts within adblockplus::log::* resources
-  $agent = getparam(Package['fluent'], 'name')
-  $index = sprintf('/var/run/%s/index.csv', $agent)
-  $group = getparam(User['fluent'], 'gid')
-
-  fluent::config {$title:
-    content => template('adblockplus/log/fluentd/default.conf.erb'),
-    ensure => $ensure,
-    name => '90-adblockplus-log-defaults',
-  }
-
   # Invoke realize(File[$adblockplus::log::directory]) when neccessary
   @file {$directory:
-    before => Service['fluent'],
     ensure => 'directory',
-    group => $group,
-    mode => 0775,
-    owner => $user,
+    require => File[$adblockplus::directory],
   }
 
   # Invoke realize(User[$adblockplus::log::user]) when necessary
   @user {$user:
-    before => File[$directory],
-    ensure => $ensure,
-    groups => [$group],
-    home => "$adblockplus::directory/log",
+    ensure => 'present',
     managehome => true,
-    require => [
-      File[$adblockplus::directory],
-      User['fluent'],
-    ],
   }
 
   # See modules/adblockplus/manifests/log/rotation.pp
   create_resources('adblockplus::log::rotation', $rotations)
-
-  # See modules/adblockplus/manifests/log/tracker.pp
-  create_resources('adblockplus::log::tracker', $trackers)
 }