added $apt_volatile_enabled, updated README

diff --git a/README b/README
index 72afcfc850c032e3aeea538fbab8088416b8df92..60c16a02fd8895736163e8393133d283cc63a019 100644 (file)
--- a/README
+++ b/README
@@ -75,13 +75,18 @@ exist there, this module will apt-key add each key
 $backports_enabled
 ------------------
 If set to true, the debian backports repository is enabled through a 
-file in /etc/apt/sources.d/. Defaults to false.
+file in /etc/apt/sources.d/. Defaults to true.
 
 $apt_deb_src_enabled
 --------------------
 If set to true, the debian sources repository is enabled through a 
 file in /etc/apt/sources.d/. Defaults to false.
 
+$apt_volatile_enabled
+--------------------
+If set to true, the debiani volatile repository is enabled through a 
+file in /etc/apt/sources.d/. Defaults to false.
+
 
 Classes
 =======

diff --git a/manifests/init.pp b/manifests/init.pp
index 11f627ba6d30c6bb535d651c2af5f64cbeea2c1d..4606a94b2d1bda87e314ace50c1ff07f36a6d834 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,6 +21,11 @@ class apt {
                'true' => 'true',
                default => $apt_deb_src_enabled,
        }
+       
+       $apt_volatile_enabled = $apt_volatile_enabled ? {
+               'true' => 'true',
+               default => $apt_volatile_enabled,
+       }
 
        package { apt: ensure => installed }
 
@@ -159,7 +164,6 @@ class apt {
        case $apt_deb_src_enabled {
          'true': {   
              config_file {
-                     # deb-src
                      "/etc/apt/sources.list.d/debian-sources.list":
                              content => template("apt/sources.list.deb-src.erb"),
                              require => Exec[assert_lsbdistcodename];
@@ -168,6 +172,17 @@ class apt {
          default: {}
        }
 
+       case $apt_volatile_enabled {
+         'true': {   
+             config_file {
+                     "/etc/apt/sources.list.d/debian-volatile.list":
+                             content => template("apt/sources.list.volatile.erb"),
+                             require => Exec[assert_lsbdistcodename];
+             }
+         }             
+         default: {}
+       }
+
         case $custom_key_dir {
           '': {
             exec { "/bin/true # no_custom_keydir": }

diff --git a/templates/sources.list.volatile.erb b/templates/sources.list.volatile.erb
new file mode 100644 (file)
index 0000000..06d6590
--- /dev/null
+++ b/templates/sources.list.volatile.erb
@@ -0,0 +1,7 @@
+# This file is brought to you by puppet
+
+<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable" || lsbdistcodename == "squeeze") -%>
+# There are no backports for for <%= lsbdistcodename %>
+<% else -%>
+deb http://volatile.debian.org/debian-volatile <%= lsbdistcodename %>/volatile main contrib non-free 
+<% end -%>