Fixes #50 - lsf_name : use a unique name in all situations

elastic · Jul 9, 2015 · a95906b · a95906b
1 parent 164a5ab
commit a95906b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -126,7 +126,7 @@
     logstashforwarder_config { 'lsf-config':
       ensure  => 'present',
       config  => $main_config,
-      path    => "${logstashforwarder::configdir}/logstash-forwarder.conf",
+      path    => "${logstashforwarder::configdir}/${logstashforwarder::lsf_name}.conf",
       tag     => "LSF_CONFIG_${::fqdn}",
       owner   => $logstashforwarder::logstashforwarder_user,
       group   => $logstashforwarder::logstashforwarder_group,

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -154,6 +154,7 @@
 #
 class logstashforwarder(
   $ensure                  = $logstashforwarder::params::ensure,
+  $lsf_name                = $logstashforwarder::params::lsf_name,
   $servers                 = undef,
   $ssl_cert                = undef,
   $ssl_key                 = undef,

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -34,6 +34,9 @@
   # ensure
   $ensure = 'present'
 
+  # Name to use instead of hardcoded name 
+  $lsf_name = 'logstash-forwarder'
+
   # autoupgrade
   $autoupgrade = false
 
@@ -123,15 +126,15 @@
   # service parameters
   case $::operatingsystem {
     'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      $service_name       = 'logstash-forwarder'
+      $service_name       = $lsf_name
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name
       $service_providers  = [ 'init' ]
       $defaults_location  = '/etc/sysconfig'
     }
     'Debian', 'Ubuntu': {
-      $service_name       = 'logstash-forwarder'
+      $service_name       = $lsf_name
       $service_hasrestart = true
       $service_hasstatus  = true
       $service_pattern    = $service_name

diff --git a/templates/etc/init.d/logstashforwarder.Debian.erb b/templates/etc/init.d/logstashforwarder.Debian.erb
@@ -18,7 +18,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 export PATH
 
-name=logstash-forwarder
+name=<%= scope.lookupvar('logstashforwarder::lsf_name' %>)
 program=<%= @installpath %>/bin/$name
 args=-config\ <%= @configdir %>/$name.conf
 pidfile="/var/run/$name.pid"