aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-01-03 19:50:51 -0200
committerSilvio Rhatto <rhatto@riseup.net>2012-01-03 19:50:51 -0200
commite32f88eaea694f7f0befa283df128a4dcd94aaa4 (patch)
treee725dec17443f4deba5b5ff4cd7d0700e5199b3a /README
parentfc4741eb7f96d94ce8de70d9e5082a294cc30202 (diff)
parenteb9fc837e97d4be9275a6ec07ebcab1a660bbcd8 (diff)
downloadkeyringer-e32f88eaea694f7f0befa283df128a4dcd94aaa4.tar.gz
keyringer-e32f88eaea694f7f0befa283df128a4dcd94aaa4.tar.bz2
Merge branch 'master' into ruby
Diffstat (limited to 'README')
-rw-r--r--README17
1 files changed, 8 insertions, 9 deletions
diff --git a/README b/README
index f3188f6..3ec56e6 100644
--- a/README
+++ b/README
@@ -118,15 +118,6 @@ Keyringer comes with a simple git wrapper to ease common management tasks:
keyringer <keyring> git push keyringer master
keyringer <keyring> git pull
-Managing puppet node keys
--------------------------
-
-Keyringer is able to manage node keys for puppet nodes. First add the puppet
-main and key folders into your keyring configuration:
-
- keyringer <keyring> preferences add PUPPET=/path/to/puppet/config
- keyringer <keyring> preferences add PUPPET_KEYS=/path/to/puppet/keys
-
Configuration files, preferences and options
--------------------------------------------
@@ -139,6 +130,14 @@ Configuration files, preferences and options
3. Custom keyring options: $KEYRING_FOLDER/config/options: managed by
"keyringer <keyring> options".
+Using a non-default OpenPGP key
+-------------------------------
+
+If you want to use a different key other than your default for a given
+keyringer, use
+
+ keyringer <keyring> preferences add KEYID=FINGERPRINT
+
Notes
-----