From 7821317f84fb2166a2bf04a513a47edc405e9e92 Mon Sep 17 00:00:00 2001
From: Max Wilhelm <max.wilhelm@wywy.com>
Date: Tue, 22 Dec 2015 13:56:46 +0100
Subject: [PATCH] added ::fluentd::user this will manage the user if  is set to
 true. This will add the td-agent user to the user group 'adm', so td-agent
 can view log files under /var/log/*.

---
 manifests/init.pp                 | 18 +++++++++++++++++-
 manifests/params.pp               |  6 ++++--
 manifests/user.pp                 | 13 +++++++++++++
 spec/classes/fluentd_user_spec.rb | 22 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 manifests/user.pp
 create mode 100644 spec/classes/fluentd_user_spec.rb

diff --git a/manifests/init.pp b/manifests/init.pp
index b5622a9..ad36270 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -27,7 +27,19 @@
 #   Service ensure
 #   Default: 'running'
 # [*service_enabled*]
-#   Defines if the service should be enabled, defaults to 'true'
+#   Defines if the service should be enabled
+#   Default: 'true'
+# [*user_manage*]
+#   Defines if the user should be manage, which will add the user
+#   to groups defined in $user_groups.
+#   For example to be able to view the /var/log directory with group adm
+#   Default: 'true'
+# [*user_name*]
+#   Default: 'td-agent'
+# [*user_group*]
+#   Default: 'td-agent'
+# [*user_groups*]
+#   Default: '["adm"]'
 #
 # Examples
 # --------
@@ -52,8 +64,10 @@ class fluentd (
   $config_path             = $::fluentd::params::config_path,
   $conf_dir                = $::fluentd::params::conf_dir,
   $config_file             = $::fluentd::params::config_file,
+  $user_manage             = $::fluentd::params::user_manage,
   $user_name               = $::fluentd::params::user_name,
   $user_group              = $::fluentd::params::user_group,
+  $user_groups             = $::fluentd::params::user_groups,
 ) inherits fluentd::params {
 
   # parameter validation
@@ -72,12 +86,14 @@ class fluentd (
   # class calls
   include '::fluentd::repo'
   include '::fluentd::install'
+  include '::fluentd::user'
   include '::fluentd::config'
   include '::fluentd::service'
 
   # dependencies
   Class['::Fluentd::Repo']    ->
   Class['::Fluentd::Install'] ->
+  Class['::Fluentd::User']    ->
   Class['::Fluentd::Config']  ->
   Class['::Fluentd::Service']
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index f4075f4..7a8a98f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -13,8 +13,10 @@ class fluentd::params {
   $conf_dir    = "${config_path}/conf.d"
   $config_file = "${config_path}/td-agent.conf"
   # user params
-  $user_name  = 'td-agent'
-  $user_group = 'td-agent'
+  $user_manage = true
+  $user_name   = 'td-agent'
+  $user_group  = 'td-agent'
+  $user_groups = ['adm']
 
   case $::osfamily {
     'Debian': {
diff --git a/manifests/user.pp b/manifests/user.pp
new file mode 100644
index 0000000..bdea541
--- /dev/null
+++ b/manifests/user.pp
@@ -0,0 +1,13 @@
+# Configure package
+#
+class fluentd::user inherits fluentd {
+
+  if $::fluentd::user_manage {
+    user { 'fluentd':
+      name    => $::fluentd::user_name,
+      gid     => $::fluentd::user_group,
+      groups  => $::fluentd::user_groups,
+      require => Class['Fluentd::Install'],
+    }
+  }
+}
diff --git a/spec/classes/fluentd_user_spec.rb b/spec/classes/fluentd_user_spec.rb
new file mode 100644
index 0000000..12af089
--- /dev/null
+++ b/spec/classes/fluentd_user_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe 'fluentd::user', :type => :class do
+  let(:facts) {
+    {
+      :osfamily        => 'Debian',
+      :lsbdistid       => 'Ubuntu',
+      :operatingsystem => 'Ubuntu',
+      :lsbdistcodename => 'precise',
+    }
+  }
+
+  describe 'when called with no parameters on Ubuntu' do
+    it {
+      should contain_user('fluentd').with({
+        'name'   => 'td-agent',
+        'gid'    => 'td-agent',
+        'groups' => ['adm']
+      })
+    }
+  end
+end