tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent OpenBSD service provider crashing if rc.conf.local file does not exist.

Browse source
This commit is contained in:
Timo Makinen 2015-11-20 15:32:35 +02:00
parent 75e8924611
commit 3f64b852f8
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
puppet/lib/puppet/provider/service/openbsd.rb
View file

@ -28,10 +28,12 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
def rcvar_local def rcvar_local
name = @resource[:name] name = @resource[:name]
File.open(rcconf_local).each do |line| if File.file?(rcconf_local)
if line =~ /^#{name}(_flags)?=/ File.open(rcconf_local).each do |line|
line = line.sub(/#.*/, "") if line =~ /^#{name}(_flags)?=/
return line.strip.split("=", 2) line = line.sub(/#.*/, "")
return line.strip.split("=", 2)
end
end end
end end
nil nil
@ -52,9 +54,11 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
end end
def pkg_scripts def pkg_scripts
File.open(rcconf_local).each do |line| if File.file?(rcconf_local)
if line =~ /^pkg_scripts=/ File.open(rcconf_local).each do |line|
return line.strip.gsub(/pkg_scripts="?([^"]*)"?/, '\1').split if line =~ /^pkg_scripts=/
return line.strip.gsub(/pkg_scripts="?([^"]*)"?/, '\1').split
end
end end
end end
Array.new Array.new
@ -84,9 +88,11 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
start = @resource[:start] start = @resource[:start]
binary = @resource[:binary] binary = @resource[:binary]
s = "" s = ""
File.open(rcconf_local).each do |line| if File.file?(rcconf_local)
next if line =~ /^(#{rcvar_name}|pkg_scripts)=/ File.open(rcconf_local).each do |line|
s += line next if line =~ /^(#{rcvar_name}|pkg_scripts)=/
s += line
end
end end
unless start.nil? unless start.nil?
if binary.nil? if binary.nil?
@ -111,9 +117,11 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
rcvar_name = self.rcvar_name rcvar_name = self.rcvar_name
pkg_scripts = self.pkg_scripts pkg_scripts = self.pkg_scripts
s = "" s = ""
File.open(rcconf_local).each do |line| if File.file?(rcconf_local)
next if line =~ /^(#{rcvar_name}|pkg_scripts)=/ File.open(rcconf_local).each do |line|
s += line next if line =~ /^(#{rcvar_name}|pkg_scripts)=/
s += line
end
end end
s += "%s=NO\n" % rcvar_name unless rcvar.nil? s += "%s=NO\n" % rcvar_name unless rcvar.nil?
pkg_scripts.delete(name) pkg_scripts.delete(name)