From: Gabriel Filion <gabster@lelutin.ca>
Date: Fri, 9 Oct 2015 20:59:33 +0000 (-0400)
Subject: Make it possible to specify own template.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e714859a10776123afe77bbd15d9f7a02ea9682f;p=puppet-apt.git

Make it possible to specify own template.

Micah found an issue with usage of config_content: if you call template('...')
yourself and pass that on to config_content, then your template gets evaluated
without all of the variables. This means that you don't hava access to
blacklisted_packages, mail_recipient or mailonlyonerror.

To make it possible to use a different template while still having access to
those variables, let's make it possible to change the template name that we're
using.
---

diff --git a/manifests/unattended_upgrades.pp b/manifests/unattended_upgrades.pp
index 6cb0518..ffb5fad 100644
--- a/manifests/unattended_upgrades.pp
+++ b/manifests/unattended_upgrades.pp
@@ -1,5 +1,6 @@
 class apt::unattended_upgrades (
   $config_content = undef,
+  $config_template = 'apt/50unattended-upgrades.erb',
   $mailonlyonerror = true,
   $mail_recipient = 'root',
   $blacklisted_packages = [],
@@ -11,7 +12,7 @@ class apt::unattended_upgrades (
   }
 
   $file_content = $config_content ? {
-    undef   => template('apt/50unattended-upgrades.erb'),
+    undef   => template($config_template),
     default => $config_content
   }