puppet 3.8.7-x64-mingw32 → 4.0.0.rc1-x64-mingw32

data/lib/puppet/provider/package/zypper.rb

@@ -9,6 +9,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
 
   commands :zypper => "/usr/bin/zypper"
 
+  defaultfor :operatingsystem => [:suse, :sles, :sled, :opensuse]
   confine    :operatingsystem => [:suse, :sles, :sled, :opensuse]
 
   #on zypper versions <1.0, the version option returns 1
@@ -34,9 +35,10 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
     end
 
     #This has been tested with following zypper versions
-    #SLE 10.4: 0.6.201
-    #SLE 11.3: 1.6.307
-    #SLE 12.0: 1.11.14
+    #SLE 10.2: 0.6.104
+    #SLE 11.0: 1.0.8
+    #OpenSuse 10.2: 0.6.13
+    #OpenSuse 11.2: 1.2.8
     #Assume that this will work on newer zypper versions
 
     #extract version numbers and convert to integers
@@ -50,24 +52,13 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
       quiet = '--quiet'
     end
 
-    inst_opts = []
-    inst_opts = install_options if resource[:install_options]
-
-
-    options = []
-    options << quiet
-    options << '--no-gpg-check' unless inst_opts.delete('--no-gpg-check').nil?
-    options << :install
+    options = [quiet, :install]
 
     #zypper 0.6.13 (OpenSuSE 10.2) does not support auto agree with licenses
     options << '--auto-agree-with-licenses' unless major < 1 and minor <= 6 and patch <= 13
     options << '--no-confirm'
-    options += inst_opts unless inst_opts.empty?
-
-    # Zypper 0.6.201 doesn't recognize '--name'
-    # It is unclear where this functionality was introduced, but it
-    # is present as early as 1.0.13
-    options << '--name' unless major < 1 || @resource.allow_virtual? || should
+    options << '--name' unless @resource.allow_virtual? || should
+    options += install_options if resource[:install_options]
     options << wanted
 
     zypper *options

data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

@@ -10,8 +10,6 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows
 
-  MINUTES_IN_DAY = 1440
-
   def self.instances
     Win32::TaskScheduler.new.tasks.collect do |job_file|
       job_title = File.basename(job_file, '.job')
@@ -78,6 +76,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
                   nil
                 end
       next unless trigger and scheduler_trigger_types.include?(trigger['trigger_type'])
+
       puppet_trigger = {}
       case trigger['trigger_type']
       when Win32::TaskScheduler::TASK_TIME_TRIGGER_DAILY
@@ -102,8 +101,6 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
       puppet_trigger['start_date'] = self.class.normalized_date("#{trigger['start_year']}-#{trigger['start_month']}-#{trigger['start_day']}")
       puppet_trigger['start_time'] = self.class.normalized_time("#{trigger['start_hour']}:#{trigger['start_minute']}")
       puppet_trigger['enabled']    = trigger['flags'] & Win32::TaskScheduler::TASK_TRIGGER_FLAG_DISABLED == 0
-      puppet_trigger['minutes_interval'] = trigger['minutes_interval'] ||= 0
-      puppet_trigger['minutes_duration'] = trigger['minutes_duration'] ||= 0
       puppet_trigger['index']      = i
 
       @triggers << puppet_trigger
@@ -212,6 +209,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
   def create
     clear_task
     @task = Win32::TaskScheduler.new(resource[:name], dummy_time_trigger)
+
     self.command = resource[:command]
 
     [:arguments, :working_dir, :enabled, :trigger, :user].each do |prop|
@@ -260,10 +258,10 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
       'flags'                   => 0,
       'random_minutes_interval' => 0,
       'end_day'                 => 0,
-      'end_year'                => 0,
-      'minutes_interval'        => 0,
-      'end_month'               => 0,
-      'minutes_duration'        => 0,
+      "end_year"                => 0,
+      "minutes_interval"        => 0,
+      "end_month"               => 0,
+      "minutes_duration"        => 0,
       'start_year'              => now.year,
       'start_month'             => now.month,
       'start_day'               => now.day,
@@ -282,7 +280,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
       trigger['flags'] &= ~Win32::TaskScheduler::TASK_TRIGGER_FLAG_DISABLED
     end
 
-    extra_keys = puppet_trigger.keys.sort - ['index', 'enabled', 'schedule', 'start_date', 'start_time', 'every', 'months', 'on', 'which_occurrence', 'day_of_week', 'minutes_interval', 'minutes_duration']
+    extra_keys = puppet_trigger.keys.sort - ['index', 'enabled', 'schedule', 'start_date', 'start_time', 'every', 'months', 'on', 'which_occurrence', 'day_of_week']
     self.fail "Unknown trigger option(s): #{Puppet::Parameter.format_value_for_display(extra_keys)}" unless extra_keys.empty?
     self.fail "Must specify 'start_time' when defining a trigger" unless puppet_trigger['start_time']
 
@@ -335,29 +333,6 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
       self.fail "Unknown schedule type: #{puppet_trigger["schedule"].inspect}"
     end
 
-    integer_interval = -1
-    if puppet_trigger['minutes_interval']
-      integer_interval = Integer(puppet_trigger['minutes_interval'])
-      self.fail 'minutes_interval must be an integer greater or equal to 0' if integer_interval < 0
-      trigger['minutes_interval'] = integer_interval
-    end
-
-    integer_duration = -1
-    if puppet_trigger['minutes_duration']
-      integer_duration = Integer(puppet_trigger['minutes_duration'])
-      self.fail 'minutes_duration must be an integer greater than minutes_interval and equal to or greater than 0' if integer_duration <= integer_interval && integer_duration != 0
-      trigger['minutes_duration'] = integer_duration
-    end
-
-    if integer_interval > 0 && integer_duration == -1
-      integer_duration = MINUTES_IN_DAY
-      trigger['minutes_duration'] = MINUTES_IN_DAY
-    end
-
-    if integer_interval >= integer_duration && integer_interval > 0
-      self.fail 'minutes_interval cannot be set without minutes_duration also being set to a number greater than 0'
-    end
-
     if start_date = puppet_trigger['start_date']
       start_date = Date.parse(start_date)
       self.fail "start_date must be on or after 1753-01-01" unless start_date >= Date.new(1753, 1, 1)

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

@@ -11,15 +11,28 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
 
   commands :kill => "kill"
 
+  # get the proper 'ps' invocation for the platform
+  # ported from the facter 2.x implementation, since facter 3.x
+  # is dropping the fact (for which this was the only use)
+  def getps
+    case Facter.value(:operatingsystem)
+    when 'OpenWrt'
+      'ps www'
+    when 'FreeBSD', 'NetBSD', 'OpenBSD', 'Darwin', 'DragonFly'
+      'ps auxwww'
+    else
+      'ps -ef'
+     end
+  end
+  private :getps
+
   # Get the process ID for a running process. Requires the 'pattern'
   # parameter.
   def getpid
     @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
-    ps = Facter["ps"].value
-    @resource.fail "You must upgrade Facter to a version that includes 'ps'" unless ps and ps != ""
     regex = Regexp.new(@resource[:pattern])
     self.debug "Executing '#{ps}'"
-    IO.popen(ps) { |table|
+    IO.popen(getps) { |table|
       table.each_line { |line|
         if regex.match(line)
           self.debug "Process matched: #{line}"
@@ -31,6 +44,7 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
 
     nil
   end
+  private :getpid
 
   # Check if the process is running.  Prefer the 'status' parameter,
   # then 'statuscmd' method, then look in the process table.  We give

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

@@ -7,7 +7,7 @@ Puppet::Type.type(:service).provide :bsd, :parent => :init do
 
   EOT
 
-  confine :operatingsystem => [:freebsd, :netbsd, :openbsd, :dragonfly]
+  confine :operatingsystem => [:freebsd, :netbsd, :dragonfly]
 
   def rcconf_dir
     '/etc/rc.conf.d'

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

@@ -45,7 +45,7 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
     attr_writer :defpath
 
     # Determine the daemon path.
-    def defpath(dummy_argument=:work_arround_for_ruby_GC_bug)
+    def defpath
       unless @defpath
         ["/var/lib/service", "/etc"].each do |path|
           if Puppet::FileSystem.exist?(path)

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

@@ -152,13 +152,6 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasrestart] == :true) && [initscript, :restart]
   end
 
-  def texecute(type, command, fof = true, squelch = false, combine = true)
-    if type == :start && Facter.value(:osfamily) == "Solaris"
-        command =  ["/usr/bin/ctrun -l none", command].flatten.join(" ")
-    end
-    super(type, command, fof, squelch, combine)
-  end
-
   # If it was specified that the init script has a 'status' command, then
   # we just return that; otherwise, we return false, which causes it to
   # fallback to other mechanisms.

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

@@ -42,7 +42,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   include Puppet::Util::Warnings
 
   commands :launchctl => "/bin/launchctl"
-  commands :sw_vers   => "/usr/bin/sw_vers"
   commands :plutil    => "/usr/bin/plutil"
 
   defaultfor :operatingsystem => :darwin
@@ -66,27 +65,12 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     ]
   end
 
-  # Gets the current Darwin version, example 10.6 returns 9 and 10.10 returns 14
-  # See https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
-  # for more information.
-  #
-  # @api private
-  def self.get_os_version
-    @os_version ||= Facter.value(:operatingsystemmajrelease).to_i
-  end
-
   # Defines the path to the overrides plist file where service enabling
   # behavior is defined in 10.6 and greater.
   #
-  # With the rewrite of launchd in 10.10+, this moves and slightly changes format.
-  #
   # @api private
   def self.launchd_overrides
-    if self.get_os_version < 14
-      "/var/db/launchd.db/com.apple.launchd/overrides.plist"
-    else
-      "/var/db/com.apple.xpc.launchd/disabled.plist"
-    end
+    "/var/db/launchd.db/com.apple.launchd/overrides.plist"
   end
 
   # Caching is enabled through the following three methods. Self.prefetch will
@@ -191,25 +175,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     @job_list
   end
 
-  # Launchd implemented plist overrides in version 10.6.
-  # This method checks the major_version of OS X and returns true if
-  # it is 10.6 or greater. This allows us to implement different plist
-  # behavior for versions >= 10.6
-  def has_macosx_plist_overrides?
-    # (#11593) Remove support for OS X 10.4 & earlier
-    # leaving this as is because 10.5 still didn't have plist support
-    return self.class.get_os_version > 9
-  end
-
   # Read a plist, whether its format is XML or in Apple's "binary1"
   # format.
   def self.read_plist(path)
-    begin
-      return Plist::parse_xml(path)
-    rescue ArgumentError, NoMethodError => detail
-      Puppet.debug("Error reading #{path}: #{detail}. Retrying with plutil.")
-    end
-
     begin
       Plist::parse_xml(plutil('-convert', 'xml1', '-o', '/dev/stdout', path))
     rescue Puppet::ExecutionFailure => detail
@@ -229,20 +197,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     @property_hash[:ensure] != :absent
   end
 
-  def self.get_macosx_version_major
-    return @macosx_version_major if @macosx_version_major
-    begin
-      product_version_major = Facter.value(:macosx_productversion_major)
-
-      fail("#{product_version_major} is not supported by the launchd provider") if %w{10.0 10.1 10.2 10.3 10.4}.include?(product_version_major)
-      @macosx_version_major = product_version_major
-      return @macosx_version_major
-    rescue Puppet::ExecutionFailure => detail
-      self.fail Puppet::Error, "Could not determine OS X version: #{detail}", detail
-    end
-  end
-
-
   # finds the path for a given label and returns the path and parsed plist
   # as an array of [path, plist]. Note plist is really a Hash here.
   def plist_from_label(label)
@@ -265,10 +219,8 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     did_enable_job = false
     cmds = []
     cmds << :launchctl << :load
-    # 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
+      cmds << "-w"
       did_enable_job = true
     end
     cmds << job_path
@@ -323,15 +275,9 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
     job_path, job_plist = plist_from_label(resource[:name])
     job_plist_disabled = job_plist["Disabled"] if job_plist.has_key?("Disabled")
 
-    if has_macosx_plist_overrides?
-      if FileTest.file?(self.class.launchd_overrides) and overrides = self.class.read_plist(self.class.launchd_overrides)
-        if overrides.has_key?(resource[:name])
-          if self.class.get_os_version < 14
-            overrides_disabled = overrides[resource[:name]]["Disabled"] if overrides[resource[:name]].has_key?("Disabled")
-          else
-            overrides_disabled = overrides[resource[:name]]
-          end
-        end
+    if FileTest.file?(self.class.launchd_overrides) and overrides = self.class.read_plist(self.class.launchd_overrides)
+      if overrides.has_key?(resource[:name])
+        overrides_disabled = overrides[resource[:name]]["Disabled"] if overrides[resource[:name]].has_key?("Disabled")
       end
     end
 
@@ -348,39 +294,15 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # enable and disable are a bit hacky. We write out the plist with the appropriate value
   # rather than dealing with launchctl as it is unable to change the Disabled flag
   # without actually loading/unloading the job.
-  # Starting in 10.6 we need to write out a disabled key to the global
-  # overrides plist, in earlier versions this is stored in the job plist itself.
   def enable
-    if has_macosx_plist_overrides?
-      overrides = self.class.read_plist(self.class.launchd_overrides)
-      if self.class.get_os_version < 14
-        overrides[resource[:name]] = { "Disabled" => false }
-      else
-        overrides[resource[:name]] = false
-      end
-      Plist::Emit.save_plist(overrides, self.class.launchd_overrides)
-    else
-      job_path, job_plist = plist_from_label(resource[:name])
-      if self.enabled? == :false
-        job_plist.delete("Disabled")
-        Plist::Emit.save_plist(job_plist, job_path)
-      end
-    end
+    overrides = self.class.read_plist(self.class.launchd_overrides)
+    overrides[resource[:name]] = { "Disabled" => false }
+    Plist::Emit.save_plist(overrides, self.class.launchd_overrides)
   end
 
   def disable
-    if has_macosx_plist_overrides?
-      overrides = self.class.read_plist(self.class.launchd_overrides)
-      if self.class.get_os_version < 14
-        overrides[resource[:name]] = { "Disabled" => true }
-      else
-        overrides[resource[:name]] = true
-      end
-      Plist::Emit.save_plist(overrides, self.class.launchd_overrides)
-    else
-      job_path, job_plist = plist_from_label(resource[:name])
-      job_plist["Disabled"] = true
-      Plist::Emit.save_plist(job_plist, job_path)
-    end
+    job_path, job_plist = plist_from_label(resource[:name])
+    job_plist["Disabled"] = true
+    Plist::Emit.save_plist(job_plist, job_path)
   end
 end

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

@@ -2,341 +2,99 @@ 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
   has_feature :flaggable
 
-  def self.rcconf()        '/etc/rc.conf' end
-  def self.rcconf_local()  '/etc/rc.conf.local' end
-
-  def self.defpath
-    ["/etc/rc.d"]
+  def startcmd
+    [command(:rcctl), '-f', :start, @resource[:name]]
   end
 
-  def startcmd
-    [self.initscript, "-f", :start]
+  def stopcmd
+    [command(:rcctl), :stop, @resource[:name]]
   end
 
   def restartcmd
-    (@resource[:hasrestart] == :true) && [self.initscript, "-f", :restart]
+    (@resource[:hasrestart] == :true) && [command(:rcctl), '-f', :restart, @resource[:name]]
   end
 
   def statuscmd
-    [self.initscript, :check]
-  end
-
-  # Fetch the state of all service resources
-  def self.prefetch(resources)
-    services = instances
-    resources.keys.each do |name|
-      if provider = services.find { |svc| svc.name == name }
-        resources[name].provider = provider
-      end
-    end
-  end
-
-  # Return the list of rc scripts
-  # @api private
-  def self.rclist
-    unless @rclist
-      Puppet.debug "Building list of rc scripts"
-      @rclist = []
-      defpath.each do |p|
-        Dir.glob(p + '/*').each do |item|
-          @rclist << item if File.executable?(item)
-        end
-      end
-    end
-    @rclist
-  end
-
-  # Return a hash where the keys are the rc script names as symbols with flags
-  # as values
-  # @api private
-  def self.rcflags
-    unless @flag_hash
-      Puppet.debug "Retrieving flags for all discovered services"
-
-      Puppet.debug "Reading the contents of the rc conf files"
-
-      if File.exists?(rcconf_local())
-        rcconf_local_contents = File.readlines(rcconf_local())
-      else
-        rcconf_local_contents = []
-      end
-
-      if File.exists?(rcconf())
-        rcconf_contents = File.readlines(rcconf())
-      else
-        rcconf_contents = []
-      end
-
-      @flag_hash = {}
-      rclist().each do |rcitem|
-
-        rcname = rcitem.split('/').last
-
-        if flagline = rcconf_local_contents.find {|l| l =~ /^#{rcname}_flags/ }
-          flag = parse_rc_line(flagline)
-          @flag_hash[rcname.to_sym] ||= flag
-        end
-
-        # For the defaults, if the flags are set to 'NO', we skip setting the
-        # flag here, since it will already be disabled, and this makes the
-        # output of `puppet resource service` a bit more correct.
-        if flagline = rcconf_contents.find {|l| l =~ /^#{rcname}_flags/ }
-          flag = parse_rc_line(flagline)
-          unless flag == "NO"
-            @flag_hash[rcname.to_sym] ||= flag
-          end
-        end
-        @flag_hash[rcname.to_sym] ||= nil
-      end
-    end
-    @flag_hash
+    [command(:rcctl), :check, @resource[:name]]
   end
 
   # @api private
-  def self.parse_rc_line(rc_line)
-    rc_line.sub!(/\s*#(.*)$/,'')
-    regex = /\w+_flags=(.*)/
-    rc_line.match(regex)[1].gsub(/^"/,'').gsub(/"$/,'')
-  end
-
-  # Read the rc.conf* files and determine the value of the flags
-  # @api private
-  def self.get_flags(rcname)
-    rcflags()
-    @flag_hash[rcname.to_sym]
-  end
-
+  # When storing the name, take into account not everything has
+  # '_flags', like 'multicast_host' and 'pf'.
   def self.instances
     instances = []
-    defpath.each do |path|
-      unless File.directory?(path)
-        Puppet.debug "Service path #{path} does not exist"
-        next
-      end
-
-      rclist().each do |d|
-        instances << new(
-          :name      => File.basename(d),
-          :path      => path,
-          :flags     => get_flags(File.basename(d)),
-          :hasstatus => true
-        )
-      end
-    end
-    instances
-  end
-
-  # @api private
-  def rcvar_name
-    self.name + '_flags'
-  end
-
-  # @api private
-  def read_rcconf_local_text()
-    if File.exists?(self.class.rcconf_local())
-      File.read(self.class.rcconf_local())
-    else
-      []
-    end
-  end
-
-  # @api private
-  def load_rcconf_local_array
-    if File.exists?(self.class.rcconf_local())
-      File.readlines(self.class.rcconf_local()).map {|l|
-        l.chomp!
-      }
-    else
-      []
-    end
-  end
-
-  # @api private
-  def write_rc_contents(file, text)
-    Puppet::Util.replace_file(file, 0644) do |f|
-      f.write(text)
-    end
-  end
-
-  # @api private
-  def set_content_flags(content,flags)
-    unless content.is_a? Array
-      debug "content must be an array at flags"
-      return ""
-    else
-      content.reject! {|l| l.nil? }
-    end
-
-    if flags.nil? or flags.size == 0
-      if in_base?
-        append = resource[:name] + '_flags=""'
-      end
-    else
-      append = resource[:name] + '_flags="' + flags + '"'
-    end
 
-    if content.find {|l| l =~ /#{resource[:name]}_flags/ }.nil?
-      content << append
-    else
-      content.map {|l| l.gsub!(/^#{resource[:name]}_flags="(.*)?"(.*)?$/, append) }
-    end
-    content
-  end
-
-  # @api private
-  def remove_content_flags(content)
-    content.reject {|l| l =~ /#{resource[:name]}_flags/ }
-  end
-
-  # return an array of the currently enabled pkg_scripts
-  # @api private
-  def pkg_scripts
-    current = load_rcconf_local_array()
-    if scripts = current.find{|l| l =~ /^pkg_scripts/ }
-      if match = scripts.match(/^pkg_scripts="(.*)?"(.*)?$/)
-        match[1].split(' ')
-      else
-        []
+    begin
+      execpipe([command(:rcctl), :getall]) do |process|
+        process.each_line do |line|
+          match = /^(.*?)(?:_flags)?=(.*)$/.match(line)
+          attributes_hash = {
+            :name      => match[1],
+            :flags     => match[2],
+            :hasstatus => true,
+            :provider  => :openbsd,
+          }
+
+          instances << new(attributes_hash);
+        end
       end
-    else
-      []
+      instances
+    rescue Puppet::ExecutionFailure
+      return nil
     end
   end
 
-  # return the array with the current resource added
-  # @api private
-  def pkg_scripts_append
-    [pkg_scripts(), resource[:name]].flatten.uniq
-  end
-
-  # return the array without the current resource
-  # @api private
-  def pkg_scripts_remove
-    pkg_scripts().reject {|s| s == resource[:name] }
-  end
-
-  # Modify the content array to contain the requsted pkg_scripts line and retun
-  # the resulting array
-  # @api private
-  def set_content_scripts(content,scripts)
-    unless content.is_a? Array
-      debug "content must be an array at scripts"
-      return ""
-    else
-      content.reject! {|l| l.nil? }
-    end
-
-    scripts_line = 'pkg_scripts="' + scripts.join(' ') + '"'
+  def enabled?
+    output = execute([command(:rcctl), "get", @resource[:name], "status"],
+                     :failonfail => false, :combine => false, :squelch => false)
 
-    if content.find {|l| l =~ /^pkg_scripts/ }.nil?
-      content << scripts_line
+    if output.exitstatus == 1
+      self.debug("Is disabled")
+      return :false
     else
-      # Replace the found pkg_scripts line with our own
-      content.each_with_index {|l,i|
-        if l =~ /^pkg_scripts/
-          content[i] = scripts_line
-        end
-      }
+      self.debug("Is enabled")
+      return :true
     end
-    content
   end
 
-  # Determine if the rc script is included in base
-  # @api private
-  def in_base?
-    script = File.readlines(self.class.rcconf).find {|s| s =~ /^#{rcvar_name}/ }
-    !script.nil?
-  end
-
-  # @api private
-  def default_disabled?
-    line = File.readlines(self.class.rcconf).find {|l| l =~ /#{rcvar_name}/ }
-    self.class.parse_rc_line(line) == 'NO'
-  end
-
-  def enabled?
-    if in_base?
-      if (@property_hash[:flags].nil? or @property_hash[:flags] == 'NO')
-        :false
-      else
-        :true
-      end
-    else
-      if (pkg_scripts().include?(@property_hash[:name]))
-        :true
-      else
-        :false
-      end
+  def enable
+    self.debug("Enabling")
+    rcctl(:enable, @resource[:name])
+    if @resource[:flags]
+      rcctl(:set, @resource[:name], :flags, @resource[:flags])
     end
   end
 
-  def enable
-    self.debug("Enabling #{self.name}")
+  def disable
+    self.debug("Disabling")
+    rcctl(:disable, @resource[:name])
   end
 
-  # We should also check for default state
-  def disable
-    self.debug("Disabling #{self.name}")
+  def running?
+    output = execute([command(:rcctl), "check", @resource[:name]],
+                     :failonfail => false, :combine => false, :squelch => false).chomp
+    return true if output.match(/\(ok\)/)
   end
 
+  # Uses the wrapper to prevent failure when the service is not running;
+  # rcctl(8) return non-zero in that case.
   def flags
-    @property_hash[:flags]
+    output = execute([command(:rcctl), "get", @resource[:name], "flags"],
+                     :failonfail => false, :combine => false, :squelch => false).chomp
+    self.debug("Flags are: \"#{output}\"")
+    output
   end
 
   def flags=(value)
-    @property_hash[:flags] = value
-  end
-
-  def flush
-    debug "Flusing resource for #{self.name}"
-
-    # Here we load the contents of the rc.conf.local file into the contents
-    # variable, modify it if needed, and then compare that to the original.  If
-    # they are different, we write it out.
-
-    original = load_rcconf_local_array()
-    content = original
-
-    debug @property_hash.inspect
-
-    if resource[:enable] == :true
-      #set_flags(resource[:flags])
-      content = set_content_flags(content, resource[:flags])
-
-      # We need only add append the resource name to the pkg_scripts if the
-      # package is not found in the base system.
-
-      if not in_base?
-        content = set_content_scripts(content,pkg_scripts_append())
-      end
-    elsif resource[:enable] == :false
-
-      # By virtue of being excluded from the base system, all packages are
-      # disabled by default and need not be set in the rc.conf.local at all.
-
-      if not in_base?
-        content = remove_content_flags(content)
-        content = set_content_scripts(content,pkg_scripts_remove())
-      else
-        if default_disabled?
-          content = remove_content_flags(content)
-        else
-          content = set_content_flags(content, "NO")
-        end
-      end
-    end
-
-    # Make sure to append a newline to the end of the file
-    unless content[-1] == ""
-      content << ""
-    end
-    output = content.join("\n")
-
-    # Write the contents only if necessary, and only once
-    write_rc_contents(self.class.rcconf_local(), output)
+    self.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?
   end
 end