aboutsummaryrefslogtreecommitdiff
path: root/templates/50unattended-upgrades.erb
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-09 12:08:26 -0400
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-10-09 12:08:26 -0400
commite4d777e5ec333c819a6b87b5c0186f67e86361ee (patch)
treeb36957b74b417e68e9c09bf5300957d2e9f4857e /templates/50unattended-upgrades.erb
parentcc53ce119f5b9b239bc1b8cdcaae6a668b8d1f8c (diff)
parent3a7dd605e344cd8bdfa33a1fb82bfefe948cbd00 (diff)
downloadpuppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.gz
puppet-apt-e4d777e5ec333c819a6b87b5c0186f67e86361ee.tar.bz2
Fix merge conflict in README
Diffstat (limited to 'templates/50unattended-upgrades.erb')
-rw-r--r--templates/50unattended-upgrades.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/50unattended-upgrades.erb b/templates/50unattended-upgrades.erb
index 23c5c89..2afebfe 100644
--- a/templates/50unattended-upgrades.erb
+++ b/templates/50unattended-upgrades.erb
@@ -5,13 +5,13 @@ Unattended-Upgrade::Allowed-Origins {
"${distro_id}:${distro_codename}-security";
"${distro_id}:${distro_codename}-updates";
"${distro_id}:${distro_codename}-backports";
-<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::operatingsystemmajrelease') == 6 -%>
+<% elsif scope.lookupvar('::operatingsystem') == 'Debian' and scope.lookupvar('::debian_codename') == 'squeeze' -%>
Unattended-Upgrade::Allowed-Origins {
"${distro_id}:oldoldstable";
"${distro_id}:squeeze-lts";
<% else -%>
Unattended-Upgrade::Origins-Pattern {
- "origin=Debian,archive=<%= scope.lookupvar('::apt::release') %>,label=Debian-Security";
+ "origin=Debian,archive=<%= scope.lookupvar('::debian_release') %>,label=Debian-Security";
"origin=Debian,archive=${distro_codename}-lts";
<% end -%>
};