aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-06 11:30:46 +0200
committerintrigeri <intrigeri@boum.org>2010-10-06 11:30:46 +0200
commite643c14ee24485b83f1d3120cf288ff14a3ae9f7 (patch)
tree0623fc6f0d58d63088dedf9253781d14ee1cfe1f
parent9139d3356280c9ed82e36c55d344315524c0d2f9 (diff)
downloadpuppet-apt-e643c14ee24485b83f1d3120cf288ff14a3ae9f7.tar.gz
puppet-apt-e643c14ee24485b83f1d3120cf288ff14a3ae9f7.tar.bz2
Use new variables.
-rw-r--r--templates/sources.list.backports.erb6
-rw-r--r--templates/sources.list.erb10
2 files changed, 8 insertions, 8 deletions
diff --git a/templates/sources.list.backports.erb b/templates/sources.list.backports.erb
index b271ca7..3be0c4e 100644
--- a/templates/sources.list.backports.erb
+++ b/templates/sources.list.backports.erb
@@ -1,8 +1,8 @@
# This file is brought to you by puppet
# backports
-<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%>
-# There are no backports for for <%= lsbdistcodename %>
+<% if (codename == "sid" || codename == "unstable") -%>
+# There are no backports for for <%= codename %>
<% else -%>
-deb http://backports.debian.org/debian-backports/ <%= lsbdistcodename %>-backports main
+deb http://backports.debian.org/debian-backports/ <%= codename %>-backports main
<% end -%>
diff --git a/templates/sources.list.erb b/templates/sources.list.erb
index feb5603..c3453d1 100644
--- a/templates/sources.list.erb
+++ b/templates/sources.list.erb
@@ -1,11 +1,11 @@
# This file is brought to you by puppet
-# basic <%= lsbdistcodename %>
-deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free
+# basic <%= codename %>
+deb http://ftp.debian.org/debian/ <%= codename %> main contrib non-free
# security suppport
-<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%>
-# There is no security mirror for <%= lsbdistcodename %>
+<% if (codename == "sid" || codename == "unstable") -%>
+# There is no security mirror for <%= codename %>
<% else -%>
-deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free
+deb http://security.debian.org/ <%= codename %>/updates main contrib non-free
<% end -%>