From 5237f9dab0480ed7eb064826c6e92d315dabaddc Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 15 Dec 2010 14:49:34 -0500
Subject: change $listchanges_* to $apt_listchanges, not nice to clutter up the
 namespace like that

---
 manifests/listchanges.pp               | 18 +++++++++---------
 templates/Debian/listchanges_lenny.erb | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 347717e..04cbc52 100644
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,37 +1,37 @@
 class apt::listchanges {
 
-  case $listchanges_version {
+  case $apt_listchanges_version {
     '': { $listchanges_version = "present" }
   }
 
-  case $listchanges_config {
+  case $apt_listchanges_config {
     '': { $listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" }
   }
 
-  case $listchanges_frontend {
+  case $apt_listchanges_frontend {
     '': { $listchanges_frontend = "mail" }
   }
 
-  case $listchanges_email {
+  case $apt_listchanges_email {
     '': { $listchanges_email = "root" }
   }
 
-  case $listchanges_confirm {
+  case $apt_listchanges_confirm {
     '': { $listchanges_confirm = "0" }
   }
 
-  case $listchanges_saveseen {
+  case $apt_listchanges_saveseen {
     '': { $listchanges_saveseen = "/var/lib/apt/listchanges.db" }
   }
 
-  case $listchanges_which {
+  case $apt_listchanges_which {
     '': { $listchanges_which = "both" }
   }
 
-  package { apt-listchanges: ensure => $listchanges_ensure_version }
+  package { apt-listchanges: ensure => $apt_listchanges_ensure_version }
   
   file { "/etc/apt/listchanges.conf":
-    content => template($listchanges_config),
+    content => template($apt_listchanges_config),
     mode => 0644, owner => root, group => root,
     require => Package["apt-listchanges"];
   }
diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges_lenny.erb
index fec3b68..3624b39 100644
--- a/templates/Debian/listchanges_lenny.erb
+++ b/templates/Debian/listchanges_lenny.erb
@@ -1,7 +1,7 @@
 [apt]
-frontend=<%= listchanges_frontend %>
-email_address=<%= listchanges_email %>
-confirm=<%= listchanges_confirm %>
-save_seen=<%= listchanges_saveseen %>
-which=<%= listchanges_which %>
+frontend=<%= apt_listchanges_frontend %>
+email_address=<%= apt_listchanges_email %>
+confirm=<%= apt_listchanges_confirm %>
+save_seen=<%= apt_listchanges_saveseen %>
+which=<%= apt_listchanges_which %>
 
-- 
cgit v1.2.3


From 67dc9a22597342d999ec450333fbd44608547442 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 15 Dec 2010 15:46:20 -0500
Subject: fix apticron template

---
 templates/Debian/apticron_lenny.erb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb
index e484700..9ec1c6d 100644
--- a/templates/Debian/apticron_lenny.erb
+++ b/templates/Debian/apticron_lenny.erb
@@ -24,8 +24,8 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>"
 # of "hostname -f" for the system name in the mails it generates
 #
 # SYSTEM="foobar.example.com"
-<%- if has_variable?(apticron_system) and instance_variable_get("@#{apticron_system}").to_s != "false" -%>
-<%= 'SYSTEM="' + instance_variable_get("@#{apticron_system}").to_s + '"' %>
+<%- if has_variable?('apticron_system') and instance_variable_get("@#{'apticron_system'}").to_s != "false" -%>
+<%= 'SYSTEM="' + instance_variable_get("@#{'apticron_system'}").to_s + '"' %>
 <%- end -%>
 
 #
@@ -34,8 +34,8 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>"
 # family type (inet, inet6), if available.
 #
 # IPADDRESSNUM="1"
-<%- if has_variable?(apticron_ipaddressnum) and instance_variable_get("@#{apticron_ipaddressnum}").to_s != "false" -%>
-<%= 'IPADDRESSNUM="' + instance_variable_get("@#{apticron_ipaddressnum}").to_s + '"' %>
+<%- if has_variable?('apticron_ipaddressnum') and instance_variable_get("@#{'apticron_ipaddressnum'}").to_s != "false" -%>
+<%= 'IPADDRESSNUM="' + instance_variable_get("@#{'apticron_ipaddressnum'}").to_s + '"' %>
 <%- end -%>
 
 #
@@ -44,6 +44,6 @@ LISTCHANGES_PROFILE="<%= apticron_listchanges_profile %>"
 # "ip" command
 #
 # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<%- if has_variable?(apticron_ipaddresses) and instance_variable_get("@#{apticron_ipaddresses}").to_s != "false" -%>
-<%= 'IPADDRESSES="' + instance_variable_get("@#{apticron_ipaddresses}").to_s + '"' %>
+<%- if has_variable?('apticron_ipaddresses') and instance_variable_get("@#{'apticron_ipaddresses'}").to_s != "false" -%>
+<%= 'IPADDRESSES="' + instance_variable_get("@#{'apticron_ipaddresses'}").to_s + '"' %>
 <%- end -%>
\ No newline at end of file
-- 
cgit v1.2.3