aboutsummaryrefslogtreecommitdiff
path: root/templates/Ubuntu/sources.list.erb
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-31 14:50:07 -0300
commitb65996f7ae03d2bae118855a3c4d94a3947e556d (patch)
tree5bab8e5c3663aaabca34ebcee3c706c4fbc35cb5 /templates/Ubuntu/sources.list.erb
parentb0425c65ecc61c6af3f31fba577b1e1c5d880674 (diff)
parent8c8bd7bb1e5cc0f5297db9629ece783452233d1f (diff)
downloadpuppet-apt-master.tar.gz
puppet-apt-master.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmasterdevelop
Conflicts: README files/Debian/50unattended-upgrades.lenny files/Debian/50unattended-upgrades.wheezy manifests/init.pp manifests/params.pp manifests/unattended_upgrades.pp templates/Debian/preferences_jessie.erb templates/Debian/sources.list.erb
Diffstat (limited to 'templates/Ubuntu/sources.list.erb')
-rw-r--r--templates/Ubuntu/sources.list.erb14
1 files changed, 5 insertions, 9 deletions
diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb
index c1a6115..e6d2f64 100644
--- a/templates/Ubuntu/sources.list.erb
+++ b/templates/Ubuntu/sources.list.erb
@@ -1,26 +1,22 @@
# This file is managed by puppet
# all local modifications will be overwritten
-# basic <%= codename=scope.lookupvar('apt::codename') %>
+# basic <%= codename=scope.lookupvar('::ubuntu_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 -%>
+<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
# updates
deb <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<% if include_src -%>
deb-src <%= ubuntu_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
+<% end
+ end -%>
# security suppport
deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
<% if include_src -%>
deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %>
<% end -%>
-
-# backports
-deb <%= ubuntu_url %> <%= codename %>-backports main <%= lrepos %>
-<% if include_src -%>
-deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>