Revert "Revert "Improvement: export the lsf_name everywhere if set in…

… the class declaration."" This reverts commit 590b99e.
elastic · Jul 21, 2015 · e43fc9f · e43fc9f
1 parent da147fe
commit e43fc9f
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 52 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -41,6 +41,57 @@
     cwd  => '/',
   }
 
+  # Different path definitions
+  case $::kernel {
+    'Linux': {
+      $configdir   = "/etc/${logstashforwarder::lsf_name}"
+      $package_dir = "/opt/${logstashforwarder::lsf_name}/swdl"
+      $installpath = "/opt/${logstashforwarder::lsf_name}"
+    }
+    'Darwin': {
+      $configdir = '/Library/Application Support/Logstashforwarder'
+      $package_dir = '/Library/Logstashforwarder/swdl'
+      $installpath = '/Library/Logstashforwarder'
+    }
+    default: {
+      fail("\"${module_name}\" provides no config directory default value
+           for \"${::kernel}\"")
+    }
+  }
+
+  # service parameters
+  case $::operatingsystem {
+    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
+      $service_name       = $logstashforwarder::lsf_name
+      $service_hasrestart = true
+      $service_hasstatus  = true
+      $service_pattern    = $service_name
+      $service_providers  = [ 'init' ]
+      $defaults_location  = '/etc/sysconfig'
+    }
+    'Debian', 'Ubuntu': {
+      $service_name       = $logstashforwarder::lsf_name
+      $service_hasrestart = true
+      $service_hasstatus  = true
+      $service_pattern    = $service_name
+      $service_providers  = [ 'init' ]
+      $defaults_location  = '/etc/default'
+    }
+    'Darwin': {
+      $service_name       = 'net.logstash.forwarder'
+      $service_hasrestart = true
+      $service_hasstatus  = true
+      $service_pattern    = $service_name
+      $service_providers  = [ 'launchd' ]
+      $defaults_location  = false
+    }
+    default: {
+      fail("\"${module_name}\" provides no service parameters
+            for \"${::operatingsystem}\"")
+    }
+  }
+
+
   if ( $logstashforwarder::ensure == 'present' ) {
 
     $ssldir = "${logstashforwarder::configdir}/ssl"

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -34,7 +34,7 @@
   # ensure
   $ensure = 'present'
 
-  # Name to use instead of hardcoded name 
+  # Name to use instead of hardcoded name
   $lsf_name = 'logstash-forwarder'
 
   # autoupgrade
@@ -89,24 +89,6 @@
     }
   }
 
-  # Different path definitions
-  case $::kernel {
-    'Linux': {
-      $configdir = '/etc/logstashforwarder'
-      $package_dir = '/opt/logstashforwarder/swdl'
-      $installpath = '/opt/logstashforwarder'
-    }
-    'Darwin': {
-      $configdir = '/Library/Application Support/Logstashforwarder'
-      $package_dir = '/Library/Logstashforwarder/swdl'
-      $installpath = '/Library/Logstashforwarder'
-    }
-    default: {
-      fail("\"${module_name}\" provides no config directory default value
-           for \"${::kernel}\"")
-    }
-  }
-
   # packages
   case $::operatingsystem {
     'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
@@ -122,37 +104,4 @@
             for \"${::operatingsystem}\"")
     }
   }
-
-  # service parameters
-  case $::operatingsystem {
-    'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
-      $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       = $lsf_name
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'init' ]
-      $defaults_location  = '/etc/default'
-    }
-    'Darwin': {
-      $service_name       = 'net.logstash.forwarder'
-      $service_hasrestart = true
-      $service_hasstatus  = true
-      $service_pattern    = $service_name
-      $service_providers  = [ 'launchd' ]
-      $defaults_location  = false
-    }
-    default: {
-      fail("\"${module_name}\" provides no service parameters
-            for \"${::operatingsystem}\"")
-    }
-  }
-
 }