diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:09:44 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-02-20 16:09:44 -0500 |
| commit | e3e0b46ca6039170c2d2faa8b2bebf14460679eb (patch) | |
| tree | 2f255b0f4d109afeb15d870f2151ec9da0100ba0 /templates | |
| parent | c9ae59e1b72d41518160ff4c7b430573b10254a3 (diff) | |
| parent | 7c55bee06ab952c914b3a367f495e36a2539807f (diff) | |
| download | puppet-apt-e3e0b46ca6039170c2d2faa8b2bebf14460679eb.tar.gz puppet-apt-e3e0b46ca6039170c2d2faa8b2bebf14460679eb.tar.bz2 | |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/apt
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Debian/preferences_squeeze.erb | 5 | ||||
| -rw-r--r-- | templates/Debian/sources.list.erb | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/templates/Debian/preferences_squeeze.erb b/templates/Debian/preferences_squeeze.erb index efe7720..838b3a1 100644 --- a/templates/Debian/preferences_squeeze.erb +++ b/templates/Debian/preferences_squeeze.erb @@ -8,6 +8,11 @@ Package: * Pin: release o=Debian,n=<%= codename %>-updates Pin-Priority: 990 +Explanation: Debian <%= codename %>-lts +Package: * +Pin: release o=Debian,n=<%= codename %>-lts +Pin-Priority: 990 + Explanation: Debian <%= next_codename=scope.lookupvar('apt::next_codename') %> Package: * Pin: release o=Debian,n=<%= next_codename %> diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb index 65b5945..8c9b28d 100644 --- a/templates/Debian/sources.list.erb +++ b/templates/Debian/sources.list.erb @@ -10,13 +10,13 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %> <% end -%> # security -<% if ((release=scope.lookupvar('apt::release')) == "unstable" || release == "experimental") -%> -# There is no security support for <%= release %> -<% else -%> +<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%> deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %> <% if include_src -%> deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %> <% end -%> +<% else -%> +# There is no security support for <%= release %> <% end -%> # backports @@ -41,6 +41,18 @@ deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %> <% end -%> <% end -%> +<% if use_lts=scope.lookupvar('apt::use_lts') -%> +# LTS +<% if release != "oldstable" -%> +# There is no LTS archive for <%= release %> +<% else -%> +deb <%= debian_url %> <%= codename %>-lts <%= lrepos %> +<% if include_src -%> +deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %> +<% end -%> +<% end -%> +<% end -%> + <% if next_release=scope.lookupvar('apt::use_next_release') -%> ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %> |