Merge pull request #468 from mhaskel/1.8.0-prep

[puppet-modules/puppetlabs-apt.git] / README.md

diff --git a/README.md b/README.md
index b325ba9d2bbbe0d7c861ff80618237e828506f10..186c2c2d3ccf3b9e93212a815ec7adf41b352b5d 100644 (file)
--- a/README.md
+++ b/README.md
@@ -74,12 +74,11 @@ class { 'apt':
 
   ```
   class { 'apt::unattended_upgrades':
-    origins     => $::apt::params::origins,
-    blacklist   => [],
-    update      => '1',
-    download    => '1',
-    upgrade     => '1',
-    autoclean   => '7',
+    blacklist     => [],
+    update        => '1',
+    download      => '1',
+    upgrade       => '1',
+    autoclean     => '7',
   }
   ```
   
@@ -201,7 +200,7 @@ class { 'apt':
     release           => 'unstable',
     repos             => 'main contrib non-free',
     required_packages => 'debian-keyring debian-archive-keyring',
-    key               => '8B48AD6246925553',
+    key               => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
     key_server        => 'subkeys.pgp.net',
     pin               => '-10',
     include_src       => true,
@@ -277,6 +276,7 @@ apt::sources:
 
 ####apt::unattended_upgrades
 
+* `legacy_origin`: If set to true, use the old `Unattended-Upgrade::Allowed-Origins` variable. If false, use `Unattended-Upgrade::Origins-Pattern`. OS-dependent defaults are defined in `apt::params`.
 * `origins`: The repositories from which to automatically upgrade included packages.
 * `blacklist`: A list of packages to **not** automatically upgrade.
 * `update`: How often, in days, to run `apt-get update`.