From 1344fba629a4d64819d649db690382477b7a32dd Mon Sep 17 00:00:00 2001 From: Dominik Richter Date: Sat, 1 Aug 2015 09:52:55 +0200 Subject: [PATCH] configurable limits_conf path Signed-off-by: Dominik Richter --- lib/resources/limits_conf.rb | 12 ++++++++++-- lib/resources/resources.rb | 4 ---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/resources/limits_conf.rb b/lib/resources/limits_conf.rb index 3dfc83c45..c87c61422 100644 --- a/lib/resources/limits_conf.rb +++ b/lib/resources/limits_conf.rb @@ -6,9 +6,9 @@ require 'utils/simpleconfig' class LimitsConf < Vulcano::Resource - def initialize + def initialize path @runner = Specinfra::Runner - @conf_path = '/etc/security/limits.conf' + @conf_path = path @files_contents = {} @content = nil @params = nil @@ -46,3 +46,11 @@ class LimitsConf < Vulcano::Resource @files_contents[path] ||= @runner.get_file_content(path).stdout end end + +module Serverspec::Type + def limits_conf(path = nil) + @limits_conf ||= {} + dpath = path || '/etc/security/limits.conf' + @limits_conf[dpath] ||= LimitsConf.new(dpath) + end +end \ No newline at end of file diff --git a/lib/resources/resources.rb b/lib/resources/resources.rb index 3bfe3b6c0..bdf722cb5 100644 --- a/lib/resources/resources.rb +++ b/lib/resources/resources.rb @@ -62,10 +62,6 @@ module Serverspec InetdConf.new() end - def limits_conf() - LimitsConf.new() - end - def login_def() LoginDef.new() end