summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-10-10 11:06:07 +0200
committerintrigeri <intrigeri@boum.org>2010-10-10 11:06:07 +0200
commitf0320059a901c8f5f3664bd1d3c6c50e57a05876 (patch)
treed1faf9384c1c92afa08cce3d7c8145bc512fa2e5
parentd50104ce10d7709c9c21f475eb6241136f937ad8 (diff)
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.
-rw-r--r--README6
-rw-r--r--manifests/init.pp4
2 files changed, 10 insertions, 0 deletions
diff --git a/README b/README
index 7b961b6..8a29141 100644
--- 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 63f489f..bb3fbef 100644
--- 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,