summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-26 15:20:30 -0200
committerMicah Anderson <micah@riseup.net>2013-06-25 15:35:11 -0400
commit50b4bef76180181a34d04958b320295c7b6e9cf0 (patch)
tree4699217074e4e8460834c32e392dec5a5aa30f47 /README
parentc38be6cb7c2cbd53a133291b2750d053877ebe4f (diff)
Make custom_key_dir a class parameter and not a global variable
Conflicts: manifests/init.pp
Diffstat (limited to 'README')
-rw-r--r--README22
1 files changed, 10 insertions, 12 deletions
diff --git a/README b/README
index f241a19..35a88b2 100644
--- a/README
+++ b/README
@@ -129,18 +129,6 @@ pull in the templates/site_apt/sources.list file:
$custom_sources_list = template('site_apt/sources.list')
-$custom_key_dir
----------------
-
-If you have different apt-key files that you want to get added to your
-apt keyring, you can set this variable to a path in your fileserver
-where individual key files can be placed. If this is set and keys
-exist there, this module will 'apt-key add' each key.
-
-The debian-archive-keyring package is installed and kept current up to the
-latest revision (this includes the backports archive keyring).
-
-
Classes
=======
@@ -235,6 +223,16 @@ Class parameters:
include apt::dist_upgrade
class { 'apt': codename => 'wheezy', notify => Exec['apt_dist-upgrade'] }
+* custom_key_dir
+
+ If you have different apt-key files that you want to get added to your
+ apt keyring, you can set this variable to a path in your fileserver
+ where individual key files can be placed. If this is set and keys
+ exist there, this module will 'apt-key add' each key.
+
+ The debian-archive-keyring package is installed and kept current up to the
+ latest revision (this includes the backports archive keyring).
+
apt::apticron
-------------