Add support for customizing the repos list (main, contrib, etc.)

The templates already made use of it, but the code didn't set a default value.

diff --git a/README b/README
index 7b961b6982f6c9563aa8ef865e8838ee3dbf311a..8a291417f23d2af2bdb923826a3f2e6592016b52 100644 (file)
--- a/README
+++ b/README
@@ -107,6 +107,12 @@ These variables allow to override the default APT mirrors respectively
 used for the standard Debian archives, the Debian security archive,
 the Debian official backports and the Debian Volatile archive.
 
+$apt_repos
+----------
+
+If this variable is set the default repositories list ("main contrib non-free")
+is overriden.
+
 Classes
 =======
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 63f489f848c3c83c8ce5bd19f8463ce4a1630a93..bb3fbef3d388576c833004ffd1e950d1d9712d0d 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -42,6 +42,10 @@ class apt {
     ''      => 'http://volatile.debian.org/debian-volatile/',
     default => "${apt_volatile_url}",
   }
+  $repos = $apt_repos ? {
+    ''      => 'main contrib non-free',
+    default => "${apt_repos}",
+  }
 
   package { apt:
     ensure => installed,