diff options
| -rw-r--r-- | lib/puppet/parser/functions/multi_source_template.rb | 29 | ||||
| -rw-r--r-- | manifests/defines/config_file.pp | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions/multi_source_template.rb b/lib/puppet/parser/functions/multi_source_template.rb new file mode 100644 index 0000000..e075320 --- /dev/null +++ b/lib/puppet/parser/functions/multi_source_template.rb @@ -0,0 +1,29 @@ +module Puppet::Parser::Functions + require 'erb' + + newfunction(:multi_source_template, :type => :rvalue) do |args| + contents = nil + environment = compiler.environment + sources = args + + sources.each do |file| + Puppet.debug("Looking for #{file} in #{environment}") + if filename = Puppet::Parser::Files.find_template(file, environment.to_s) + wrapper = Puppet::Parser::TemplateWrapper.new(self) + wrapper.file = file + + begin + contents = wrapper.result + rescue => detail + raise Puppet::ParseError, "Failed to parse template %s: %s" % [file, detail] + end + + break + end + end + + raise Puppet::ParseError, "multi_source_template: No match found for files: #{sources.join(', ')}" if contents == nil + + contents + end +end diff --git a/manifests/defines/config_file.pp b/manifests/defines/config_file.pp index d624c10..2be2460 100644 --- a/manifests/defines/config_file.pp +++ b/manifests/defines/config_file.pp @@ -33,7 +33,7 @@ define config_file ($content = '', $source = '', $ensure = 'present') { file { $name: ensure => $ensure, # keep old versions on the server - backup => server, + backup => puppet, # default permissions for config files mode => 0644, owner => root, group => 0, # really detect changes to this file |