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

puppet/lib/puppet/provider/service/openbsd.rb: Remove OpenBSD 4.9 support

Browse source
This commit is contained in:
Ossi Salmi 2014-05-14 17:06:39 +03:00
parent ad1ed9e24e
commit 20dba2daf3
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,14 +11,6 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
def rcconf() '/etc/rc.conf' end def rcconf() '/etc/rc.conf' end
def rcconf_local() '/etc/rc.conf.local' end def rcconf_local() '/etc/rc.conf.local' end
def pkg_scripts_var()
if Facter["operatingsystemrelease"].value == "4.9"
return "rc_scripts"
else
return "pkg_scripts"
end
end
def rcscript def rcscript
return File.join(rc_dir, @resource[:name]) return File.join(rc_dir, @resource[:name])
end end
@ -61,8 +53,8 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
def pkg_scripts def pkg_scripts
File.open(rcconf_local).each do |line| File.open(rcconf_local).each do |line|
if line =~ /^#{pkg_scripts_var}=/ if line =~ /^pkg_scripts=/
return line.strip.gsub(/#{pkg_scripts_var}="?([^"]*)"?/, '\1').split return line.strip.gsub(/pkg_scripts="?([^"]*)"?/, '\1').split
end end
end end
Array.new Array.new
@ -93,7 +85,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
binary = @resource[:binary] binary = @resource[:binary]
s = "" s = ""
File.open(rcconf_local).each do |line| File.open(rcconf_local).each do |line|
next if line =~ /^(#{rcvar_name}|#{pkg_scripts_var})=/ next if line =~ /^(#{rcvar_name}|pkg_scripts)=/
s += line s += line
end end
unless start.nil? unless start.nil?
@ -109,7 +101,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
s += "%s=YES\n" % rcvar_name s += "%s=YES\n" % rcvar_name
end end
pkg_scripts << name if rcvar.nil? and not pkg_scripts.include?(name) pkg_scripts << name if rcvar.nil? and not pkg_scripts.include?(name)
s += "#{pkg_scripts_var}=\"%s\"\n" % pkg_scripts.join(" ") s += "pkg_scripts=\"%s\"\n" % pkg_scripts.join(" ")
File.open(rcconf_local, "w") { |f| f << s } File.open(rcconf_local, "w") { |f| f << s }
end end
@ -120,12 +112,12 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :base do
pkg_scripts = self.pkg_scripts pkg_scripts = self.pkg_scripts
s = "" s = ""
File.open(rcconf_local).each do |line| File.open(rcconf_local).each do |line|
next if line =~ /^(#{rcvar_name}|#{pkg_scripts_var})=/ next if line =~ /^(#{rcvar_name}|pkg_scripts)=/
s += line s += line
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)
s += "#{pkg_scripts_var}=\"%s\"\n" % pkg_scripts.join(" ") s += "pkg_scripts=\"%s\"\n" % pkg_scripts.join(" ")
File.open(rcconf_local, "w") { |f| f << s } File.open(rcconf_local, "w") { |f| f << s }
end end