aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2010-12-07 23:57:25 -0500
committerMicah Anderson <micah@riseup.net>2010-12-07 23:57:25 -0500
commit36c4873f87af74ba1ab9f780db2992c788ef925f (patch)
tree2f211401fdf4a80d2adf69cf71c223db3387b335
parentee21742cf8f59d6bf0f8f70d44d30b44556dde3d (diff)
downloadpuppet-apt-36c4873f87af74ba1ab9f780db2992c788ef925f.tar.gz
puppet-apt-36c4873f87af74ba1ab9f780db2992c788ef925f.tar.bz2
multiple sources for templates are not allowed (see #1818), so revert it to a single source referenced by the README, and clarify the README to indicate how you can pass the preseed contents directly
-rw-r--r--README8
-rw-r--r--manifests/preseeded_package.pp4
2 files changed, 5 insertions, 7 deletions
diff --git a/README b/README
index 7abb1ea..109c92a 100644
--- a/README
+++ b/README
@@ -233,11 +233,11 @@ following in your manifest:
apt::preseeded_package { locales: }
-You can also specify 'content' to define this file via a template. Here's an
-example for preseeding installation of the 'mysql' package with a template:
+You can also specify the content of the seed via the content parameter,
+for example:
- apt::preseeded_package { "mysql":
- content => template("site-apt/mysql.seed.erb"),
+ apt::preseeded_package { "apticron":
+ content => "apticron apticron/notification string root@example.com",
}
apt::sources_list
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 74aafa5..42c6200 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,9 +1,7 @@
define apt::preseeded_package ($content = "", $ensure = "installed") {
$seedfile = "/var/cache/local/preseeding/$name.seeds"
$real_content = $content ? {
- "" => template ( "site-apt/$name.seeds",
- "site-apt/$lsbdistcodename/$name.seeds",
- "$name.seeds", "$lsbdistcodename/$name.seeds" ),
+ "" => template ( "site-apt/$lsbdistcodename/$name.seeds" )
default => $content
}