Skip to content

Commit

Permalink
Use config_user and config_group instead of hard coded root
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Friderici committed Dec 5, 2023
1 parent 48e7213 commit 7f765ac
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
4 changes: 2 additions & 2 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions manifests/configfile.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 10 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions manifests/patternfile.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
$pipelines = $logstash::pipelines

File {
owner => 'root',
group => 'root',
owner => $logstash::config_user,
group => $logstash::config_group,
mode => '0644',
notify => Exec['logstash-system-install'],
}
Expand Down

0 comments on commit 7f765ac

Please sign in to comment.