From 75c3cf66fb1933a191e8ce4c612946cb9679391f Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Tue, 26 Mar 2024 14:38:49 +0100
Subject: [PATCH] Don't hardcode the service provider

Since years Puppet is able to figure it out on its own. We don't need to
reimplement the logic.
---
 REFERENCE.md         |  2 +-
 manifests/init.pp    |  2 +-
 manifests/service.pp | 40 +---------------------------------------
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/REFERENCE.md b/REFERENCE.md
index 951ed620..744945e0 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -242,7 +242,7 @@ Default value: `true`
 
 ##### <a name="-logstash--service_provider"></a>`service_provider`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Service provider (init system) to use. By Default, the module will try to
 choose the 'standard' provider for the current distribution.
diff --git a/manifests/init.pp b/manifests/init.pp
index 0d5b02d3..7c808d1f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -154,7 +154,7 @@
   $logstash_group    = 'logstash',
   $config_dir         = '/etc/logstash',
   Boolean $purge_config = true,
-  $service_provider  = undef,
+  Optional[String[1]] $service_provider = undef,
   $settings          = {},
   $startup_options   = {},
   $jvm_options_defaults = {
diff --git a/manifests/service.pp b/manifests/service.pp
index ec73ba7f..c61bcffd 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -113,50 +113,12 @@
     }
   }
 
-  # Figure out which service provider (init system) we should be using.
-  # In general, we'll try to guess based on the operating system.
-  $os = downcase($facts['os']['name'])
-  $release = $facts['os']['release']['major']
-  # However, the operator may have explicitly defined the service provider.
-  if($logstash::service_provider) {
-    $service_provider = $logstash::service_provider
-  }
-  # In the absence of an explicit choice, we'll try to figure out a sensible
-  # default.
-  # Puppet 3 doesn't know that Debian 8 uses systemd, not SysV init, so we'll
-  # help it out with our knowledge from the future.
-  elsif($os == 'debian' and $release == '8') {
-    $service_provider = 'systemd'
-  }
-  # RedHat/CentOS/OEL 6 uses Upstart by default, but Puppet can get confused about this too.
-  elsif($os =~ /(redhat|centos|oraclelinux)/ and $release == '6') {
-    $service_provider = 'upstart'
-  }
-  elsif($os =~ /ubuntu/ and $release == '12.04') {
-    $service_provider = 'upstart'
-  }
-  elsif($os =~ /opensuse/ and $release == '13') {
-    $service_provider = 'systemd'
-  }
-  #Older Amazon Linux AMIs has its release based on the year
-  #it came out (2010 and up); the provider needed to be set explicitly;
-  #New Amazon Linux 2 AMIs has the release set to 2, Puppet can handle it
-  elsif($os =~ /amazon/ and versioncmp($release, '2000') > 0) {
-    $service_provider = 'upstart'
-  }
-  else {
-    # In most cases, Puppet(4) can figure out the correct service
-    # provider on its own, so we'll just say 'undef', and let it do
-    # whatever it thinks is best.
-    $service_provider = undef
-  }
-
   service { 'logstash':
     ensure     => $service_ensure,
     enable     => $service_enable,
     hasstatus  => true,
     hasrestart => true,
-    provider   => $service_provider,
+    provider   => $logstash::service_provider,
   }
 
   # If any files tagged as config files for the service are changed, notify