diff --git a/manifests/config.pp b/manifests/config.pp index cc1fa3d..bdb0ba6 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -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, diff --git a/manifests/init.pp b/manifests/init.pp index fbe03d3..67b773b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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 @@ -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, diff --git a/manifests/params.pp b/manifests/params.pp index 06cc955..66a773d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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.