Feature file permissions

REFERENCE.md

@@ -110,6 +110,8 @@ The following parameters are available in the `logstash` class:
 * [`home_dir`](#-logstash--home_dir)
 * [`logstash_user`](#-logstash--logstash_user)
 * [`logstash_group`](#-logstash--logstash_group)
+* [`config_user`](#-logstash--config_user)
+* [`config_group`](#-logstash--config_group)
 * [`purge_config`](#-logstash--purge_config)
 * [`service_provider`](#-logstash--service_provider)
 * [`settings`](#-logstash--settings)
@@ -220,18 +222,34 @@ Default value: `'/usr/share/logstash'`
 
 Data type: `String`
 
-The user that Logstash should run as. This also controls file ownership.
+The user that Logstash should run as.
 
 Default value: `'logstash'`
 
 ##### <a name="-logstash--logstash_group"></a>`logstash_group`
 
 Data type: `String`
 
-The group that Logstash should run as. This also controls file group ownership.
+The group that Logstash should run as.
 
 Default value: `'logstash'`
 
+##### <a name="-logstash--config_user"></a>`config_user`
+
+Data type: `String`
+
+The user that owns Logstash control files.
+
+Default value: `'root'`
+
+##### <a name="-logstash--config_group"></a>`config_group`
+
+Data type: `String`
+
+The group that owns Logstash control files.
+
+Default value: `'root'`
+
 ##### <a name="-logstash--purge_config"></a>`purge_config`
 
 Data type: `Boolean`

manifests/config.pp

@@ -9,8 +9,8 @@
   require logstash::package
 
   File {
-    owner => 'root',
-    group => 'root',
+    owner => $logstash::config_user,
+    group => $logstash::config_group,
   }
 
   # Configuration "fragment" directories for pipeline config and pattern files.
@@ -21,22 +21,22 @@
   if($logstash::ensure == 'present') {
     file { $logstash::config_dir:
       ensure => directory,
-      mode   => '0755',
+      mode   => '0750',
     }
 
     file { "${logstash::config_dir}/conf.d":
       ensure  => directory,
       purge   => $logstash::purge_config,
       recurse => $logstash::purge_config,
-      mode    => '0775',
+      mode    => '0770',
       notify  => Service['logstash'],
     }
 
     file { "${logstash::config_dir}/patterns":
       ensure  => directory,
       purge   => $logstash::purge_config,
       recurse => $logstash::purge_config,
-      mode    => '0755',
+      mode    => '0750',
     }
   }
   elsif($logstash::ensure == 'absent') {

manifests/configfile.pp

@@ -49,8 +49,8 @@
 ) {
   include logstash
 
-  $owner = 'root'
-  $group = $logstash::logstash_group
+  $owner = $logstash::config_user
+  $group = $logstash::config_group
   $mode  = '0640'
   $require = Package['logstash'] # So that we have '/etc/logstash/conf.d'.
   $tag = ['logstash_config'] # So that we notify the service.

manifests/init.pp

@@ -52,10 +52,16 @@
 #   The home directory for logstash.
 #
 # @param [String] logstash_user
-#   The user that Logstash should run as. This also controls file ownership.
+#   The user that Logstash should run as.
 #
 # @param [String] logstash_group
-#   The group that Logstash should run as. This also controls file group ownership.
+#   The group that Logstash should run as.
+#
+# @param [String] config_user
+#   The user that owns Logstash control files.
+#
+# @param [String] config_group
+#   The group that owns Logstash control files.
 #
 # @param [Boolean] purge_config
 #   Purge the config directory of any unmanaged files,
@@ -152,6 +158,8 @@
   Stdlib::Absolutepath $home_dir = '/usr/share/logstash',
   $logstash_user     = 'logstash',
   $logstash_group    = 'logstash',
+  $config_user       = 'root',
+  $config_group      = 'root',
   $config_dir         = '/etc/logstash',
   Boolean $purge_config = true,
   $service_provider  = undef,

manifests/patternfile.pp

@@ -1,9 +1,9 @@
 # This type represents a Grok pattern file for Logstash.
 #
-# @param [String] source
+# @param source
 #   File source for the pattern file. eg. `puppet://[...]` or `file://[...]`
 #
-# @param [String] filename
+# @param filename
 #   Optionally set the destination filename.
 #
 # @example Define a pattern file.
@@ -30,8 +30,8 @@
   file { "${logstash::config_dir}/patterns/${destination}":
     ensure => file,
     source => $source,
-    owner  => 'root',
-    group  => $logstash::logstash_group,
+    owner  => $logstash::config_user,
+    group  => $logstash::config_group,
     mode   => '0640',
     tag    => ['logstash_config'],
   }

manifests/service.pp

@@ -37,9 +37,9 @@
   $pipelines = $logstash::pipelines
 
   File {
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0644',
+    owner  => $logstash::config_user,
+    group  => $logstash::config_group,
+    mode   => '0640',
     notify => Exec['logstash-system-install'],
   }