From 221277e8522b42bf170fded6ea23dfc526703b07 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 29 Aug 2013 12:19:16 -0400 Subject: Update file_line resource to support 'after'. When adding new lines to a file the 'after' option can be useful when you need to insert file lines into the middle of a file. This is particularly helpful when using file_line with sectioned config files. NOTE: the after option only works when adding new lines. If you are updating an existing (matched) line it will simply modify it in place. This assumes it was in the right place to begin with. --- lib/puppet/provider/file_line/ruby.rb | 28 +++++++++++++++++++++++++--- lib/puppet/type/file_line.rb | 4 ++++ 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb index 3cb9f6e..7ddb39f 100644 --- a/lib/puppet/provider/file_line/ruby.rb +++ b/lib/puppet/provider/file_line/ruby.rb @@ -49,10 +49,32 @@ Puppet::Type.type(:file_line).provide(:ruby) do end def handle_create_without_match - File.open(resource[:path], 'a') do |fh| - fh.puts resource[:line] + + regex = resource[:after] ? Regexp.new(resource[:after]) : nil + after_count = File.exists?(resource[:path]) ? lines.select { |l| regex.match(l) }.size : 0 + if after_count > 1 then + raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches after pattern '#{resource[:after]}'" end - end + if (after_count == 0) + + File.open(resource[:path], 'a') do |fh| + fh.puts resource[:line] + end + + else + + File.open(resource[:path], 'w') do |fh| + lines.each do |l| + fh.puts(l) + if regex.match(l) then + fh.puts(resource[:line]) + end + end + end + + end + + end end diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb index 14946bb..323fc4c 100644 --- a/lib/puppet/type/file_line.rb +++ b/lib/puppet/type/file_line.rb @@ -42,6 +42,10 @@ Puppet::Type.newtype(:file_line) do newvalues(true, false) end + newparam(:after) do + desc 'An optional value used to specify the line after which we will add any new lines. (Existing lines are added in place)' + end + newparam(:line) do desc 'The line to be appended to the file located by the path parameter.' end -- cgit v1.2.3