aboutsummaryrefslogtreecommitdiff
path: root/templates/Ubuntu/sources.list.erb
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-01-30 16:47:30 +0100
committervarac <varacanero@zeromail.org>2013-01-30 16:47:30 +0100
commit6c135ea7bc2ae9951154cf5471801469e3e3d581 (patch)
tree11edc63e26ce79f4e6ba2634d42c0796797f3236 /templates/Ubuntu/sources.list.erb
parent92d2d7be5f99920c67245d02c1ce76288967db62 (diff)
parent14670466be5eceba043e697d5f6f0f0ada9d5b07 (diff)
downloadpuppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.gz
puppet-apt-6c135ea7bc2ae9951154cf5471801469e3e3d581.tar.bz2
Merge remote-tracking branch 'remotes/shared/master'
Diffstat (limited to 'templates/Ubuntu/sources.list.erb')
-rw-r--r--templates/Ubuntu/sources.list.erb26
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index b5725f5..c1a6115 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -1,26 +1,26 @@
# This file is managed by puppet
# all local modifications will be overwritten
-# basic <%= lsbdistcodename %>
-deb <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %>
-<% if include_src then -%>
-deb-src <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %>
+# basic <%= codename=scope.lookupvar('apt::codename') %>
+deb <%= ubuntu_url=scope.lookupvar('apt::ubuntu_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
+<% if include_src=scope.lookupvar('apt::include_src') -%>
+deb-src <%= ubuntu_url %> <%= codename %> <%= lrepos %>
<% end -%>
# updates
-deb <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %>
-<% if include_src then -%>
-deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-updates <%= repos %>
+deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
+<% if include_src -%>
+deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
<% end -%>
# security suppport
-deb <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %>
-<% if include_src then -%>
-deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-security <%= repos %>
+deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
+<% if include_src -%>
+deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
<% end -%>
# backports
-deb <%= ubuntu_url %> <%= lsbdistcodename %>-backports main <%= repos %>
-<% if include_src then -%>
-deb-src <%= ubuntu_url %> <%= lsbdistcodename %>-backports <%= repos %>
+deb <%= ubuntu_url %> <%= codename %>-backports main <%= lrepos %>
+<% if include_src -%>
+deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
<% end -%>