summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2008-09-28 18:00:56 -0400
committerMicah Anderson <micah@riseup.net>2008-09-28 18:00:56 -0400
commite0a6bf1b7a480cead5776962c9524d157aa96f1b (patch)
tree9e3af11a51776d20cb144c7464a4fe98d1f9ffb0
parent746d47f42449e218a26ec935d86f3bcf0dc1e742 (diff)
Revert "turn preferences into a simple file"
This reverts commit 0011e70a24ff49169da294b00b6b39b77fb05c86.
-rw-r--r--manifests/init.pp2
-rw-r--r--templates/preferences.erb (renamed from files/preferences)0
2 files changed, 1 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 3eb7448..f85a535 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -44,7 +44,7 @@ class apt {
config_file {
# this just pins unstable and testing to very low values
"/etc/apt/preferences":
- source => "puppet://$servername/apt/preferences",
+ content => template("apt/preferences.erb"),
# use File[apt_config] to reference a completed configuration
# See "The Puppet Semaphor" 2007-06-25 on the puppet-users ML
alias => apt_config,
diff --git a/files/preferences b/templates/preferences.erb
index ac71582..ac71582 100644
--- a/files/preferences
+++ b/templates/preferences.erb