Revert "turn preferences into a simple file"

This reverts commit 0011e70a24ff49169da294b00b6b39b77fb05c86.

diff --git a/manifests/init.pp b/manifests/init.pp
index 3eb7448c16e535aa470f487b12526a68ecf197b6..f85a535f9276eec613e34f6dd5618beb5bb4777a 100644 (file)
--- 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
similarity index 100%
rename from files/preferences
rename to templates/preferences.erb