Add opt-in support for next Debian release sources.

diff --git a/README b/README
index f39007b510f59a901c7539471034f084e338da8f..1a0fd3c4e8ecaaf5a842badb15913ef602f3a85d 100644 (file)
--- a/README
+++ b/README
@@ -92,6 +92,15 @@ added binary archive source.
 By default this is false for backward compatibility with older
 versions of this module.
 
+$apt_use_next_release
+---------------------
+
+If this variable is set to true the sources for the next Debian
+release are added. The default pinning configuration pins it to very
+low values.
+By default this is false for backward compatibility with older
+versions of this module.
+
 Classes
 =======
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 7f52a9c0d0eac2c46e8f94668747f25e3835d9a7..095fe79d0309109c8884dbc5f656f9935a0af5e0 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,6 +21,11 @@ class apt {
     default => $apt_include_src,
   }
 
+  $use_next_release = $apt_use_next_release ? {
+    ''      => false,
+    default => $apt_use_next_release,
+  }
+
   package { apt:
     ensure => installed,
     require => undef,

diff --git a/templates/sources.list.erb b/templates/sources.list.erb
index 35fac321eed7e6eefe47afecad64a9e3fdc68ed5..43f4a56513e1b405a06103fea6623bd799b28ca6 100644 (file)
--- a/templates/sources.list.erb
+++ b/templates/sources.list.erb
@@ -40,3 +40,44 @@ deb-src http://volatile.debian.org/debian-volatile/ <%= codename %>/volatile <%=
 <% end %>
 <% end %>
 
+<% if use_next_release then %>
+### Debian next: <%= next_codename %>
+
+# basic
+deb <%= http://ftp.debian.org/debian/ %> <%= next_codename %> <%= repos %>
+<% if include_src then %>
+deb-src <%= http://ftp.debian.org/debian/ %> <%= next_codename %> <%= repos %>
+<% end %>
+
+# security
+<% if (next_release == "unstable" || next_release == "experimental") %>
+# There is no security support for <%= next_release %>
+<% else %>
+deb http://security.debian.org/ <%= next_codename %>/updates <%= repos %>
+<% if include_src then %>
+deb-src http://security.debian.org/ <%= next_codename %>/updates <%= repos %>
+<% end %>
+<% end %>
+
+# backports
+<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") %>
+# There is no backports archive for <%= next_release %>
+<% else %>
+deb http://backports.debian.org/debian-backports/ <%= next_codename %>-backports <%= repos %>
+<% if include_src then %>
+deb-src http://backports.debian.org/debian-backports/ <%= next_codename %>-backports <%= repos %>
+<% end %>
+<% end %>
+
+<% if use_volatile %>
+# volatile
+<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") %>
+# There is no volatile archive for <%= next_release %>
+<% else %>
+deb http://volatile.debian.org/debian-volatile/ <%= next_codename %>/volatile <%= repos %>
+<% if include_src then %>
+deb-src http://volatile.debian.org/debian-volatile/ <%= next_codename %>/volatile <%= repos %>
+<% end %>
+<% end %>
+<% end %>
+<% end %>