openvox 7.37.1 → 8.19.0

data/lib/puppet/provider/service/init.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # The standard init-based service type.  Many other service types are
 # customizations of this module.
 Puppet::Type.type(:service).provide :init, :parent => :base do
   desc "Standard `init`-style service management."
 
   def self.defpath
-    case Puppet.runtime[:facter].value(:operatingsystem)
+    case Puppet.runtime[:facter].value('os.name')
     when "FreeBSD", "DragonFly"
       ["/etc/rc.d", "/usr/local/etc/rc.d"]
     when "HP-UX"
@@ -19,12 +21,12 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   # Debian and Ubuntu should use the Debian provider.
-  confine :false => ['Debian', 'Ubuntu'].include?(Puppet.runtime[:facter].value('operatingsystem'))
+  confine :false => %w[Debian Ubuntu].include?(Puppet.runtime[:facter].value('os.name'))
   # RedHat systems should use the RedHat provider.
-  confine :false => Puppet.runtime[:facter].value('osfamily') == 'RedHat'
+  confine :false => Puppet.runtime[:facter].value('os.family') == 'RedHat'
 
   # We can't confine this here, because the init path can be overridden.
-  #confine :exists => defpath
+  # confine :exists => defpath
 
   # some init scripts are not safe to execute, e.g. we do not want
   # to suddenly run /etc/init.d/reboot.sh status and reboot our system. The
@@ -33,9 +35,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   def self.excludes
     excludes = []
     # these exclude list was found with grep -L '\/sbin\/runscript' /etc/init.d/* on gentoo
-    excludes += %w{functions.sh reboot.sh shutdown.sh}
+    excludes += %w[functions.sh reboot.sh shutdown.sh]
     # this exclude list is all from /sbin/service (5.x), but I did not exclude kudzu
-    excludes += %w{functions halt killall single linuxconf reboot boot}
+    excludes += %w[functions halt killall single linuxconf reboot boot]
     # 'wait-for-state' and 'portmap-wait' are excluded from instances here
     # because they take parameters that have unclear meaning. It looks like
     # 'wait-for-state' is a generic waiter mainly used internally for other
@@ -47,37 +49,37 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # eventually explain how to use the wait-for-state service or perhaps why
     # it should remain excluded. When that bug is addressed this should be
     # reexamined.
-    excludes += %w{wait-for-state portmap-wait}
+    excludes += %w[wait-for-state portmap-wait]
     # these excludes were found with grep -r -L start /etc/init.d
-    excludes += %w{rcS module-init-tools}
+    excludes += %w[rcS module-init-tools]
     # Prevent puppet failing on unsafe scripts from Yocto Linux
-    if Puppet.runtime[:facter].value(:osfamily) == "cisco-wrlinux"
-      excludes += %w{banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
-                   hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
-                   rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
-                   umountnfs.sh}
+    if Puppet.runtime[:facter].value('os.family') == "cisco-wrlinux"
+      excludes += %w[banner.sh bootmisc.sh checkroot.sh devpts.sh dmesg.sh
+                     hostname.sh mountall.sh mountnfs.sh populate-volatile.sh
+                     rmnologin.sh save-rtc.sh sendsigs sysfs.sh umountfs
+                     umountnfs.sh]
     end
     # Prevent puppet failing to get status of the new service introduced
     # by the fix for this (bug https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/982889)
     # due to puppet's inability to deal with upstart services with instances.
-    excludes += %w{plymouth-ready}
+    excludes += %w[plymouth-ready]
     # Prevent puppet failing to get status of these services, which need parameters
     # passed in (see https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1276766).
-    excludes += %w{idmapd-mounting startpar-bridge}
+    excludes += %w[idmapd-mounting startpar-bridge]
     # Prevent puppet failing to get status of these services, additional upstart
     # service with instances
-    excludes += %w{cryptdisks-udev}
-    excludes += %w{statd-mounting}
-    excludes += %w{gssd-mounting}
+    excludes += %w[cryptdisks-udev]
+    excludes += %w[statd-mounting]
+    excludes += %w[gssd-mounting]
     excludes
   end
 
   # List all services of this type.
   def self.instances
-    get_services(self.defpath)
+    get_services(defpath)
   end
 
-  def self.get_services(defpath, exclude = self.excludes)
+  def self.get_services(defpath, exclude = excludes)
     defpath = [defpath] unless defpath.is_a? Array
     instances = []
     defpath.each do |path|
@@ -97,6 +99,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         next if Puppet::FileSystem.directory?(fullpath)
         next unless Puppet::FileSystem.executable?(fullpath)
         next unless is_init?(fullpath)
+
         instances << new(:name => name, :path => path, :hasstatus => true)
       end
     end
@@ -115,7 +118,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   # Where is our init script?
   def initscript
-    @initscript ||= self.search(@resource[:name])
+    @initscript ||= search(@resource[:name])
   end
 
   def paths
@@ -124,9 +127,9 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
         true
       else
         if Puppet::FileSystem.exist?(path)
-          self.debug "Search path #{path} is not a directory"
+          debug "Search path #{path} is not a directory"
         else
-          self.debug "Search path #{path} does not exist"
+          debug "Search path #{path} does not exist"
         end
         false
       end
@@ -135,20 +138,20 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
 
   def search(name)
     paths.each do |path|
-      fqname = File.join(path,name)
+      fqname = File.join(path, name)
       if Puppet::FileSystem.exist? fqname
         return fqname
       else
-        self.debug("Could not find #{name} in #{path}")
+        debug("Could not find #{name} in #{path}")
       end
     end
 
     paths.each do |path|
-      fqname_sh = File.join(path,"#{name}.sh")
+      fqname_sh = File.join(path, "#{name}.sh")
       if Puppet::FileSystem.exist? fqname_sh
         return fqname_sh
       else
-        self.debug("Could not find #{name}.sh in #{path}")
+        debug("Could not find #{name}.sh in #{path}")
       end
     end
     raise Puppet::Error, "Could not find init script for '#{name}'"
@@ -169,8 +172,8 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
   end
 
   def service_execute(type, command, fof = true, squelch = false, combine = true)
-    if type == :start && Puppet.runtime[:facter].value(:osfamily) == "Solaris"
-        command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
+    if type == :start && Puppet.runtime[:facter].value('os.family') == "Solaris"
+      command = ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end
     super(type, command, fof, squelch, combine)
   end
@@ -182,11 +185,10 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasstatus] == :true) && [initscript, :status]
   end
 
-private
+  private
 
   def self.is_init?(script = initscript)
     file = Puppet::FileSystem.pathname(script)
     !Puppet::FileSystem.symlink?(file) || Puppet::FileSystem.readlink(file) != "/lib/init/upstart-job"
   end
 end
-

data/lib/puppet/provider/service/launchd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
@@ -42,9 +44,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
   commands :launchctl => "/bin/launchctl"
 
-  defaultfor :operatingsystem => :darwin
-  confine :operatingsystem    => :darwin
-  confine :feature            => :cfpropertylist
+  defaultfor 'os.name' => :darwin
+  confine 'os.name'    => :darwin
+  confine :feature => :cfpropertylist
 
   has_feature :enableable
   has_feature :refreshable
@@ -70,7 +72,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.get_os_version
-    @os_version ||= Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i
+    # rubocop:disable Naming/MemoizedInstanceVariableName
+    @os_version ||= Facter.value('os.release.major').to_i
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   # Defines the path to the overrides plist file where service enabling
@@ -80,7 +84,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   #
   # @api private
   def self.launchd_overrides
-    if self.get_os_version < 14
+    if get_os_version < 14
       "/var/db/launchd.db/com.apple.launchd/overrides.plist"
     else
       "/var/db/com.apple.xpc.launchd/disabled.plist"
@@ -103,8 +107,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # containing the name, provider, path, and status of each service on the
   # system.
   def self.instances
-    jobs = self.jobsearch
-    @job_list ||= self.job_list
+    jobs = jobsearch
+    @job_list ||= job_list
     jobs.keys.collect do |job|
       job_status = @job_list.has_key?(job) ? :running : :stopped
       new(:name => job, :provider => :launchd, :path => jobs[job], :status => job_status)
@@ -130,18 +134,20 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # the cache will be refreshed if refresh is true.
   #
   # @api private
-  def self.make_label_to_path_map(refresh=false)
-    return @label_to_path_map if @label_to_path_map and not refresh
+  def self.make_label_to_path_map(refresh = false)
+    return @label_to_path_map if @label_to_path_map and !refresh
+
     @label_to_path_map = {}
     launchd_paths.each do |path|
       return_globbed_list_of_file_paths(path).each do |filepath|
         Puppet.debug("Reading launchd plist #{filepath}")
         job = read_plist(filepath)
         next if job.nil?
+
         if job.respond_to?(:key) && job.key?("Label")
           @label_to_path_map[job["Label"]] = filepath
         else
-          #TRANSLATORS 'plist' and label' should not be translated
+          # TRANSLATORS 'plist' and label' should not be translated
           Puppet.debug(_("The %{file} plist does not contain a 'label' key; Puppet is skipping it") % { file: filepath })
           next
         end
@@ -154,17 +160,17 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # are found on the system. The key of the hash is the job id and the value
   # is the path to the file. If a label is passed, we return the job id and
   # path for that specific job.
-  def self.jobsearch(label=nil)
+  def self.jobsearch(label = nil)
     by_label = make_label_to_path_map
 
     if label
       if by_label.has_key? label
-        return { label => by_label[label] }
+        { label => by_label[label] }
       else
         # try refreshing the map, in case a plist has been added in the interim
         by_label = make_label_to_path_map(true)
         if by_label.has_key? label
-          return { label => by_label[label] }
+          { label => by_label[label] }
         else
           raise Puppet::Error, "Unable to find launchd plist for job: #{label}"
         end
@@ -181,12 +187,13 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     @job_list = Hash.new
     begin
       output = launchctl :list
-      raise Puppet::Error.new("launchctl list failed to return any data.") if output.nil?
+      raise Puppet::Error, "launchctl list failed to return any data." if output.nil?
+
       output.split("\n").each do |line|
         @job_list[line.split(/\s/).last] = :running
       end
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to determine status of #{resource[:name]}", e)
     end
     @job_list
   end
@@ -202,10 +209,11 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     i = 1
     overrides = nil
     loop do
-      Puppet.debug(_("Reading overrides plist, attempt %{i}") % {i: i}) if i > 1
+      Puppet.debug(_("Reading overrides plist, attempt %{i}") % { i: i }) if i > 1
       overrides = read_plist(launchd_overrides)
       break unless overrides.nil?
-      raise Puppet::Error.new(_('Unable to read overrides plist, too many attempts')) if i == 20
+      raise Puppet::Error, _('Unable to read overrides plist, too many attempts') if i == 20
+
       Puppet.info(_('Overrides file could not be read, trying again.'))
       Kernel.sleep(0.1)
       i += 1
@@ -231,7 +239,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     if FileTest.file?(job_path)
       job_plist = self.class.read_plist(job_path)
     else
-      raise Puppet::Error.new("Unable to parse launchd plist at path: #{job_path}")
+      raise Puppet::Error, "Unable to parse launchd plist at path: #{job_path}"
     end
     [job_path, job_plist]
   end
@@ -240,7 +248,7 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # status mechanism and fall back to the base provider status method.
   def status
     if @resource && ((@resource[:hasstatus] == :false) || (@resource[:status]))
-      return super
+      super
     elsif @property_hash[:status].nil?
       # property_hash was flushed so the service changed status
       service_name = @resource[:name]
@@ -273,20 +281,19 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     # always add -w so it always starts the job, it is a noop if it is not needed, this means we do
     # not have to rescan all launchd plists.
     cmds << "-w"
-    if self.enabled? == :false  || self.status == :stopped # launchctl won't load disabled jobs
+    if enabled? == :false || status == :stopped # launchctl won't load disabled jobs
       did_enable_job = true
     end
     cmds << job_path
     begin
       execute(cmds)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to start service: #{resource[:name]} at path: #{job_path}", e)
     end
     # As load -w clears the Disabled flag, we need to add it in after
-    self.disable if did_enable_job and resource[:enable] == :false
+    disable if did_enable_job and resource[:enable] == :false
   end
 
-
   def stop
     if resource[:stop]
       service_command(:stop)
@@ -296,26 +303,26 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     did_disable_job = false
     cmds = []
     cmds << :launchctl << :unload
-    if self.enabled? == :true # keepalive jobs can't be stopped without disabling
+    if enabled? == :true # keepalive jobs can't be stopped without disabling
       cmds << "-w"
       did_disable_job = true
     end
     cmds << job_path
     begin
       execute(cmds)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}", $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new("Unable to stop service: #{resource[:name]} at path: #{job_path}", e)
     end
     # As unload -w sets the Disabled flag, we need to add it in after
-    self.enable if did_disable_job and resource[:enable] == :true
+    enable if did_disable_job and resource[:enable] == :true
   end
 
   def restart
     Puppet.debug("A restart has been triggered for the #{resource[:name]} service")
     Puppet.debug("Stopping the #{resource[:name]} service")
-    self.stop
+    stop
     Puppet.debug("Starting the #{resource[:name]} service")
-    self.start
+    start
   end
 
   # launchd jobs are enabled by default. They are only disabled if the key

data/lib/puppet/provider/service/openbsd.rb

@@ -1,11 +1,12 @@
-Puppet::Type.type(:service).provide :openbsd, :parent => :init do
+# frozen_string_literal: true
 
+Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   desc "Provider for OpenBSD's rc.d daemon control scripts"
 
   commands :rcctl => '/usr/sbin/rcctl'
 
-  confine :operatingsystem => :openbsd
-  defaultfor :operatingsystem => :openbsd
+  confine 'os.name' => :openbsd
+  defaultfor 'os.name' => :openbsd
   has_feature :flaggable
 
   def startcmd
@@ -35,10 +36,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
         process.each_line do |line|
           match = /^(.*?)(?:_flags)?=(.*)$/.match(line)
           attributes_hash = {
-            :name      => match[1],
-            :flags     => match[2],
+            :name => match[1],
+            :flags => match[2],
             :hasstatus => true,
-            :provider  => :openbsd,
+            :provider => :openbsd,
           }
 
           instances << new(attributes_hash);
@@ -46,7 +47,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
       end
       instances
     rescue Puppet::ExecutionFailure
-      return nil
+      nil
     end
   end
 
@@ -55,16 +56,16 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
                      :failonfail => false, :combine => false, :squelch => false)
 
     if output.exitstatus == 1
-      self.debug("Is disabled")
-      return :false
+      debug("Is disabled")
+      :false
     else
-      self.debug("Is enabled")
-      return :true
+      debug("Is enabled")
+      :true
     end
   end
 
   def enable
-    self.debug("Enabling")
+    debug("Enabling")
     rcctl(:enable, @resource[:name])
     if @resource[:flags]
       rcctl(:set, @resource[:name], :flags, @resource[:flags])
@@ -72,14 +73,14 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   end
 
   def disable
-    self.debug("Disabling")
+    debug("Disabling")
     rcctl(:disable, @resource[:name])
   end
 
   def running?
     output = execute([command(:rcctl), "check", @resource[:name]],
                      :failonfail => false, :combine => false, :squelch => false).chomp
-    return true if output =~ /\(ok\)/
+    true if output =~ /\(ok\)/
   end
 
   # Uses the wrapper to prevent failure when the service is not running;
@@ -87,12 +88,12 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   def flags
     output = execute([command(:rcctl), "get", @resource[:name], "flags"],
                      :failonfail => false, :combine => false, :squelch => false).chomp
-    self.debug("Flags are: \"#{output}\"")
+    debug("Flags are: \"#{output}\"")
     output
   end
 
   def flags=(value)
-    self.debug("Changing flags from #{flags} to #{value}")
+    debug("Changing flags from #{flags} to #{value}")
     rcctl(:set, @resource[:name], :flags, value)
     # If the service is already running, force a restart as the flags have been changed.
     rcctl(:restart, @resource[:name]) if running?

data/lib/puppet/provider/service/openrc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Gentoo OpenRC
 Puppet::Type.type(:service).provide :openrc, :parent => :base do
   desc <<-EOT
@@ -7,8 +9,8 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
 
   EOT
 
-  defaultfor :operatingsystem => :gentoo
-  defaultfor :operatingsystem => :funtoo
+  defaultfor 'os.name' => :gentoo
+  defaultfor 'os.name' => :funtoo
 
   has_command(:rcstatus, '/bin/rc-status') do
     environment :RC_SVCNAME => nil
@@ -38,7 +40,7 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
       when /^\S+/ # caption of a dynamic runlevel
         enabled = :false
       when self.class::STATUSLINE
-        return enabled if @resource[:name] == $1
+        return enabled if @resource[:name] == Regexp.last_match(1)
       end
     end
     :false
@@ -57,7 +59,7 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   end
 
   def startcmd
-    [command(:rcservice), @resource[:name], :start ]
+    [command(:rcservice), @resource[:name], :start]
   end
 
   def stopcmd
@@ -67,5 +69,4 @@ Puppet::Type.type(:service).provide :openrc, :parent => :base do
   def statuscmd
     ((@resource.provider.get(:hasstatus) == true) || (@resource[:hasstatus] == :true)) && [command(:rcservice), @resource[:name], :status]
   end
-
 end

data/lib/puppet/provider/service/openwrt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init do
   desc <<-EOT
     Support for OpenWrt flavored init scripts.
@@ -6,8 +8,8 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
 
   EOT
 
-  defaultfor :operatingsystem => :openwrt
-  confine :operatingsystem => :openwrt
+  defaultfor 'os.name' => :openwrt
+  confine 'os.name' => :openwrt
 
   has_feature :enableable
 
@@ -16,21 +18,20 @@ Puppet::Type.type(:service).provide :openwrt, :parent => :init, :source => :init
   end
 
   def enable
-    system(self.initscript, 'enable')
+    system(initscript, 'enable')
   end
 
   def disable
-    system(self.initscript, 'disable')
+    system(initscript, 'disable')
   end
 
   def enabled?
     # We can't define the "command" for the init script, so we call system?
-    if system(self.initscript, 'enabled') then return :true else return :false end
+    system(initscript, 'enabled') ? (return :true) : (return :false)
   end
 
   # Purposely leave blank so we fail back to ps based status detection
   # As OpenWrt init script do not have status commands
   def statuscmd
   end
-
 end

data/lib/puppet/provider/service/rcng.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   desc <<-EOT
     RCng service management with rc.d
   EOT
 
-  defaultfor :operatingsystem => [:netbsd, :cargos]
-  confine :operatingsystem => [:netbsd, :cargos]
+  defaultfor 'os.name' => [:netbsd, :cargos]
+  confine 'os.name' => [:netbsd, :cargos]
 
   def self.defpath
     "/etc/rc.d"
@@ -29,7 +31,7 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
   # enable service by creating a service file under rc.conf.d with the
   # proper contents, or by modifying it's contents to to enable the service.
   def enable
-    Dir.mkdir(rcconf_dir) if not Puppet::FileSystem.exist?(rcconf_dir)
+    Dir.mkdir(rcconf_dir) unless Puppet::FileSystem.exist?(rcconf_dir)
     rcfile = File.join(rcconf_dir, @resource[:name])
     if Puppet::FileSystem.exist?(rcfile)
       newcontents = []
@@ -39,11 +41,11 @@ Puppet::Type.type(:service).provide :rcng, :parent => :bsd do
         end
         newcontents.push(line)
       end
-      Puppet::Util.replace_file(rcfile, 0644) do |f|
+      Puppet::Util.replace_file(rcfile, 0o644) do |f|
         f.puts newcontents
       end
     else
-      Puppet::Util.replace_file(rcfile, 0644) do |f|
+      Puppet::Util.replace_file(rcfile, 0o644) do |f|
         f.puts "%s=${%s:=YES}\n" % [@resource[:name], @resource[:name]]
       end
     end

data/lib/puppet/provider/service/redhat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Manage Red Hat services.  Start/stop uses /sbin/service and enable/disable uses chkconfig
 
 Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init do
@@ -8,8 +10,9 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
 
   commands :chkconfig => "/sbin/chkconfig", :service => "/sbin/service"
 
-  defaultfor :osfamily => :redhat
-  defaultfor :osfamily => :suse, :operatingsystemmajrelease => ["10", "11"]
+  defaultfor 'os.name' => :amazon, 'os.release.major' => %w[2017 2018]
+  defaultfor 'os.name' => :redhat, 'os.release.major' => (4..6).to_a
+  defaultfor 'os.family' => :suse, 'os.release.major' => %w[10 11]
 
   # Remove the symlinks
   def disable
@@ -20,7 +23,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # and --del removes the service from chkconfig management
     chkconfig("--level", "0123456", @resource[:name], :off)
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not disable #{self.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not disable #{name}: #{detail}", detail.backtrace
   end
 
   def enabled?
@@ -35,7 +38,7 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
     # For Suse OS family, chkconfig returns 0 even if the service is disabled or non-existent
     # Therefore, check the output for '<name>  on' (or '<name>  B for boot services)
     # to see if it is enabled
-    return :false unless Puppet.runtime[:facter].value(:osfamily) != 'Suse' || output =~ /^#{name}\s+(on|B)$/
+    return :false unless Puppet.runtime[:facter].value('os.family') != 'Suse' || output =~ /^#{name}\s+(on|B)$/
 
     :true
   end
@@ -43,10 +46,10 @@ Puppet::Type.type(:service).provide :redhat, :parent => :init, :source => :init
   # Don't support them specifying runlevels; always use the runlevels
   # in the init scripts.
   def enable
-      chkconfig("--add", @resource[:name])
-      chkconfig(@resource[:name], :on)
+    chkconfig("--add", @resource[:name])
+    chkconfig(@resource[:name], :on)
   rescue Puppet::ExecutionFailure => detail
-    raise Puppet::Error, "Could not enable #{self.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not enable #{name}: #{detail}", detail.backtrace
   end
 
   def initscript