diff options
author | Antoine Beaupré <anarcat@koumbit.org> | 2015-06-11 11:04:46 -0400 |
---|---|---|
committer | Gabriel Filion <gabster@lelutin.ca> | 2015-12-04 12:36:25 -0500 |
commit | e4a9222d861ae05a8d9d0a43f2ed4aa0be229390 (patch) | |
tree | 4bedf834df211a088f6715505ebb8fa8e03c50a9 | |
parent | bfa973a66896208e2cf0bea37ec15a4f950f09bd (diff) |
move backports to snippets
this allows for third party modules to enable this on the fly
-rw-r--r-- | manifests/init.pp | 17 | ||||
-rw-r--r-- | templates/Debian/sources.list.erb | 12 | ||||
-rw-r--r-- | templates/Ubuntu/sources.list.erb | 8 |
3 files changed, 16 insertions, 21 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index fc93eb3..4f5dd25 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -46,7 +46,7 @@ class apt( default => $custom_sources_list } file { - # include main, security and backports + # include main and security # additional sources should be included via the apt::sources_list define '/etc/apt/sources.list': content => $sources_content, @@ -98,6 +98,21 @@ class apt( # backports uses the normal archive key now package { 'debian-backports-keyring': ensure => absent } + if $use_backports { + if ($release != "testing" and $release != "unstable" and $release != "experimental") { + apt::sources_list { + "${codename}-backports": + content => "deb $backports_url ${codename}-backports ${apt::real_repos}", + } + if $include_src { + apt::sources_list { + "${codename}-backports-src": + content => "deb-src $backports_url ${codename}-backports ${apt::real_repos}", + } + } + } + } + include common::moduledir common::module_dir { 'apt': } $apt_base_dir = "${common::moduledir::module_dir_path}/apt" diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index bde87ac..44eea53 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -19,18 +19,6 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> # There is no security support for <%= release %> <% end -%> -<% if use_backports=scope.lookupvar('apt::use_backports') -%> -# backports -<% if (release == "testing" || release == "unstable" || release == "experimental") -%> -# There is no backports archive for <%= release %> -<% else -%> -deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %> -<% if include_src -%> -deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %> -<% end - end - end -%> - <% if use_volatile=scope.lookupvar('apt::use_volatile') -%> # volatile <% if (release == "testing" || release == "unstable" || release == "experimental") -%> diff --git a/templates/Ubuntu/sources.list.erb b/templates/Ubuntu/sources.list.erb index d0a3a5a..e6d2f64 100644 --- a/templates/Ubuntu/sources.list.erb +++ b/templates/Ubuntu/sources.list.erb @@ -20,11 +20,3 @@ deb <%= ubuntu_url %> <%= codename %>-security <%= lrepos %> <% if include_src -%> deb-src <%= ubuntu_url %> <%= codename %>-security <%= lrepos %> <% end -%> - -<% if use_backports=scope.lookupvar('apt::use_backports') -%> -# backports -deb <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %> -<% if include_src -%> -deb-src <%= ubuntu_url %> <%= codename %>-backports <%= lrepos %> -<% end - end -%> |