16 files changed, 12 insertions, 216 deletions
diff --git a/templates/Debian/apticron_wheezy.erb b/templates/Debian/apticron.erb
index 655854e..c6d3853 100644
--- a/templates/Debian/apticron_wheezy.erb
+++ b/templates/Debian/apticron.erb
@@ -46,7 +46,7 @@ IPADDRESSNUM="<%= v %>"
 #
 # IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
 <% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
-IPADDRESSES=<%= v %>"
+IPADDRESSES="<%= v %>"
 <% end -%>
 
 #
diff --git a/templates/Debian/apticron_jessie.erb b/templates/Debian/apticron_jessie.erb
deleted file mode 120000
index a9a3a6f..0000000
--- a/templates/Debian/apticron_jessie.erb
+++ /dev/null
@@ -1 +0,0 @@
-apticron_wheezy.erb
-\ No newline at end of file
diff --git a/templates/Debian/apticron_lenny.erb b/templates/Debian/apticron_lenny.erb
deleted file mode 100644
index 86b0997..0000000
--- a/templates/Debian/apticron_lenny.erb
+++ /dev/null
@@ -1,50 +0,0 @@
-# apticron.conf
-#
-# set EMAIL to a list of addresses which will be notified of impending updates
-#
-EMAIL="<%= scope.lookupvar('apt::apticron::email') %>"
-
-#
-# Set DIFF_ONLY to "1" to only output the difference of the current run
-# compared to the last run (ie. only new upgrades since the last run). If there
-# are no differences, no output/email will be generated. By default, apticron
-# will output everything that needs to be upgraded.
-#
-DIFF_ONLY="<%= scope.lookupvar('apt::apticron::diff_only') %>"
-
-#
-# Set LISTCHANGES_PROFILE if you would like apticron to invoke apt-listchanges
-# with the --profile option. You should add a corresponding profile to
-# /etc/apt/listchanges.conf
-#
-LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %>"
-
-#
-# Set SYSTEM if you would like apticron to use something other than the output
-# of "hostname -f" for the system name in the mails it generates
-#
-# SYSTEM="foobar.example.com"
-<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
-SYSTEM="<%= v %>"
-<% end -%>
-
-#
-# Set IPADDRESSNUM if you would like to configure the maximal number of IP
-# addresses apticron displays. The default is to display 1 address of each
-# family type (inet, inet6), if available.
-#
-# IPADDRESSNUM="1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
-IPADDRESSNUM="<%= v %>"
-<% end -%>
-
-#
-# Set IPADDRESSES to a whitespace seperated list of reachable addresses for
-# this system. By default, apticron will try to work these out using the
-# "ip" command
-#
-# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
-IPADDRESSES="<%= v %>"
-<% end -%>
-
diff --git a/templates/Debian/apticron_sid.erb b/templates/Debian/apticron_sid.erb
deleted file mode 120000
index a9a3a6f..0000000
--- a/templates/Debian/apticron_sid.erb
+++ /dev/null
@@ -1 +0,0 @@
-apticron_wheezy.erb
-\ No newline at end of file
diff --git a/templates/Debian/apticron_squeeze.erb b/templates/Debian/apticron_squeeze.erb
deleted file mode 100644
index 05b7c9b..0000000
--- a/templates/Debian/apticron_squeeze.erb
+++ /dev/null
@@ -1,82 +0,0 @@
-# apticron.conf
-#
-# set EMAIL to a space separated list of addresses which will be notified of
-# impending updates
-#
-EMAIL="<%= scope.lookupvar('apt::apticron::email') %>"
-
-
-#
-# Set DIFF_ONLY to "1" to only output the difference of the current run
-# compared to the last run (ie. only new upgrades since the last run). If there
-# are no differences, no output/email will be generated. By default, apticron
-# will output everything that needs to be upgraded.
-#
-DIFF_ONLY="<%= scope.lookupvar('apt::apticron::diff_only') %>"
-
-#
-# Set LISTCHANGES_PROFILE if you would like apticron to invoke apt-listchanges
-# with the --profile option. You should add a corresponding profile to
-# /etc/apt/listchanges.conf
-#
-LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %>"
-
-#
-# Set SYSTEM if you would like apticron to use something other than the output
-# of "hostname -f" for the system name in the mails it generates
-#
-# SYSTEM="foobar.example.com"
-<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
-SYSTEM="<%= v %>"
-<% end -%>
-
-
-#
-# Set IPADDRESSNUM if you would like to configure the maximal number of IP
-# addresses apticron displays. The default is to display 1 address of each
-# family type (inet, inet6), if available.
-#
-# IPADDRESSNUM="1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
-IPADDRESSNUM="<%= v %>"
-<% end -%>
-
-
-#
-# Set IPADDRESSES to a whitespace separated list of reachable addresses for
-# this system. By default, apticron will try to work these out using the
-# "ip" command
-#
-# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
-<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
-IPADDRESSES="<%= v %>"
-<% end -%>
-
-
-#
-# Set NOTIFY_HOLDS="0" if you don't want to be notified about new versions of
-# packages on hold in your system. The default behavior is downloading and
-# listing them as any other package.
-#
-# NOTIFY_HOLDS="0"
-NOTIFY_HOLDS="<%= scope.lookupvar('apt::apticron::notifyholds') %>"
-
-#
-# Set NOTIFY_NEW="0" if you don't want to be notified about packages which
-# are not installed in your system. Yes, it's possible! There are some issues
-# related to systems which have mixed stable/unstable sources. In these cases
-# apt-get will consider for example that packages with "Priority:
-# required"/"Essential: yes" in unstable but not in stable should be installed,
-# so they will be listed in dist-upgrade output. Please take a look at
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531002#44
-#
-# NOTIFY_NEW="0"
-NOTIFY_NEW="<%= scope.lookupvar('apt::apticron::notifynew') %>"
-
-#
-# Set CUSTOM_SUBJECT if you want to replace the default subject used in
-# the notification e-mails. This may help filtering/sorting client-side e-mail.
-#
-# CUSTOM_SUBJECT=""
-CUSTOM_SUBJECT="<%= scope.lookupvar('apt::apticron::customsubject') %>"
-
diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges.erb
index 1025dd0..1025dd0 100644
--- a/templates/Debian/listchanges_lenny.erb
+++ b/templates/Debian/listchanges.erb
diff --git a/templates/Debian/listchanges_jessie.erb b/templates/Debian/listchanges_jessie.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_jessie.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb
-\ No newline at end of file
diff --git a/templates/Debian/listchanges_sid.erb b/templates/Debian/listchanges_sid.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_sid.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb
-\ No newline at end of file
diff --git a/templates/Debian/listchanges_squeeze.erb b/templates/Debian/listchanges_squeeze.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_squeeze.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb
-\ No newline at end of file
diff --git a/templates/Debian/listchanges_wheezy.erb b/templates/Debian/listchanges_wheezy.erb
deleted file mode 120000
index 74ab496..0000000
--- a/templates/Debian/listchanges_wheezy.erb
+++ /dev/null
@@ -1 +0,0 @@
-listchanges_lenny.erb
-\ No newline at end of file
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences.erb
index 885edc7..37cf80d 100644
--- a/templates/Debian/preferences_squeeze.erb
+++ b/templates/Debian/preferences.erb
@@ -1,30 +1,33 @@
+# This file is managed by puppet
+# all local modifications will be overwritten
+
 Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
 Package: *
 Pin: release o=Debian,n=<%= codename %>
 Pin-Priority: 990
 
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 Explanation: Debian <%= codename %>-updates
 Package: *
 Pin: release o=Debian,n=<%= codename %>-updates
 Pin-Priority: 990
+<%- end -%>
 
+<% if (use_lts=scope.lookupvar('apt::use_lts')) && (scope.lookupvar('::debian_lts') == "true") -%>
 Explanation: Debian <%= codename %>-lts
 Package: *
 Pin: release o=Debian,n=<%= codename %>-lts
 Pin-Priority: 990
+<%- end -%>
 
-Explanation: Debian <%= next_codename=scope.lookupvar('::debian_nextcodename') %>
+<% if (next_codename=scope.lookupvar('::debian_nextcodename')) && (next_codename != "experimental") -%>
+Explanation: Debian <%= next_codename %>
 Package: *
 Pin: release o=Debian,n=<%= next_codename %>
 Pin-Priority: 2
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
+<%- end -%>
 
 Explanation: Debian fallback
 Package: *
 Pin: release o=Debian
 Pin-Priority: -10
-
diff --git a/templates/Debian/preferences_jessie.erb b/templates/Debian/preferences_jessie.erb
deleted file mode 100644
index 0888abe..0000000
--- a/templates/Debian/preferences_jessie.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,n=<%= codename %>
-Pin-Priority: 990
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
diff --git a/templates/Debian/preferences_lenny.erb b/templates/Debian/preferences_lenny.erb
deleted file mode 100644
index 6500168..0000000
--- a/templates/Debian/preferences_lenny.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,a=<%= scope.lookupvar('::debian_release') %>,v=5*
-Pin-Priority: 990
-
-Explanation: Debian backports
-Package: *
-Pin: origin backports.debian.org
-Pin-Priority: 200
-
-Explanation: Debian <%= next_release=scope.lookupvar('::debian_nextrelease') %>
-Package: *
-Pin: release o=Debian,a=<%= next_release %>
-Pin-Priority: 2
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,a=unstable
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-
diff --git a/templates/Debian/preferences_sid.erb b/templates/Debian/preferences_sid.erb
deleted file mode 100644
index eb18554..0000000
--- a/templates/Debian/preferences_sid.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 990
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-
diff --git a/templates/Debian/preferences_wheezy.erb b/templates/Debian/preferences_wheezy.erb
deleted file mode 100644
index 106108d..0000000
--- a/templates/Debian/preferences_wheezy.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,n=<%= codename %>
-Pin-Priority: 990
-
-Explanation: Debian <%= codename %>-updates
-Package: *
-Pin: release o=Debian,n=<%= codename %>-updates
-Pin-Priority: 990
-
-Explanation: Debian sid
-Package: *
-Pin: release o=Debian,n=sid
-Pin-Priority: 1
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-
diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 44eea53..c7318a2 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -4,7 +4,7 @@
 ### Debian current: <%= codename=scope.lookupvar('::debian_codename') %>
 
 # basic
-deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::repos') %>
 <% if include_src=scope.lookupvar('apt::include_src')  -%>
 deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>