Skip to content

added config_file_path param #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

added config_file_path param #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
602f972
added config_file_path param
Jun 24, 2015
84c29f0
ensure conf.d dir exists
Jun 24, 2015
8e3dfc0
remove conf.d test that was committed to wrong branch.
Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
logstashforwarder_config { 'lsf-config':
ensure => 'present',
config => $main_config,
path => '/etc/logstash-forwarder.conf',
path => $logstashforwarder::config_file_path,
tag => "LSF_CONFIG_${::fqdn}",
owner => $logstashforwarder::logstashforwarder_user,
group => $logstashforwarder::logstashforwarder_group,
Expand Down
4 changes: 4 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
# Path to directory containing the Logstash Forwarder configuration.
# Use this setting if your packages deviate from the norm (/etc/logstashforwarder)
#
# [*config_file_path*]
# Path to the main Logstash Forwarder configuration file.
#
# [*package_url*]
# Url to the package to download.
# This can be a http,https or ftp resource for remote packages
Expand Down Expand Up @@ -171,6 +174,7 @@
$logstashforwarder_user = $logstashforwarder::params::logstashforwarder_user,
$logstashforwarder_group = $logstashforwarder::params::logstashforwarder_group,
$configdir = $logstashforwarder::params::configdir,
$config_file_path = $logstashforwarder::params::config_file_path,
$purge_configdir = $logstashforwarder::params::purge_configdir,
$service_provider = 'init',
$init_defaults = $logstashforwarder::params::init_defaults,
Expand Down
2 changes: 2 additions & 0 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
# Exec timeout
$package_dl_timeout = 300 # 300 seconds is default of Puppet

$config_file_path = '/etc/logstash-forwarder.conf'

#### Internal module values

# User and Group for the files and user to run the service as.
Expand Down