From e0a6bf1b7a480cead5776962c9524d157aa96f1b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 28 Sep 2008 18:00:56 -0400 Subject: Revert "turn preferences into a simple file" This reverts commit 0011e70a24ff49169da294b00b6b39b77fb05c86. --- files/preferences | 7 ------- manifests/init.pp | 2 +- templates/preferences.erb | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 files/preferences create mode 100644 templates/preferences.erb diff --git a/files/preferences b/files/preferences deleted file mode 100644 index ac71582..0000000 --- a/files/preferences +++ /dev/null @@ -1,7 +0,0 @@ -Package: * -Pin: release a=unstable -Pin-Priority: 1 - -Package: * -Pin: release a=testing -Pin-Priority: 2 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/templates/preferences.erb b/templates/preferences.erb new file mode 100644 index 0000000..ac71582 --- /dev/null +++ b/templates/preferences.erb @@ -0,0 +1,7 @@ +Package: * +Pin: release a=unstable +Pin-Priority: 1 + +Package: * +Pin: release a=testing +Pin-Priority: 2 -- cgit v1.2.3