You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by br...@apache.org on 2012/11/29 21:32:09 UTC
[3/3] git commit: FLUME-1751: User Guide Examples for File Channel
encryption are broken in 1.3 rc5
FLUME-1751: User Guide Examples for File Channel encryption are broken in 1.3 rc5
(Roshan Naik via Brock Noland)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/5bad32c7
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/5bad32c7
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/5bad32c7
Branch: refs/heads/trunk
Commit: 5bad32c7f65bb933405c418818a843e5dcbc57d5
Parents: 2a72fb7
Author: Brock Noland <br...@apache.org>
Authored: Thu Nov 29 14:26:07 2012 -0600
Committer: Brock Noland <br...@apache.org>
Committed: Thu Nov 29 14:26:07 2012 -0600
----------------------------------------------------------------------
flume-ng-doc/sphinx/FlumeUserGuide.rst | 28 ++++++++++++--------------
1 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/5bad32c7/flume-ng-doc/sphinx/FlumeUserGuide.rst
----------------------------------------------------------------------
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index edb1fa7..f8528bb 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -1727,10 +1727,10 @@ Generating a key with the password the same as the key store password:
a1.channels.c1.encryption.activeKey = key-0
a1.channels.c1.encryption.cipherProvider = AESCTRNOPADDING
a1.channels.c1.encryption.keyProvider = key-provider-0
- a1.channels.c1.encryption.keyProvider.key-provider-0.type = JCEKSFILE
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStoreFile = /path/to/my.keystore
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStorePasswordFile = /path/to/my.keystore.password
- a1.channels.c1.encryption.keyProvider.key-provider-0.keys = key-0
+ a1.channels.c1.encryption.keyProvider = JCEKSFILE
+ a1.channels.c1.encryption.keyProvider.keyStoreFile = /path/to/my.keystore
+ a1.channels.c1.encryption.keyProvider.keyStorePasswordFile = /path/to/my.keystore.password
+ a1.channels.c1.encryption.keyProvider.keys = key-0
Let's say you have aged key-0 out and new files should be encrypted with key-1:
@@ -1738,11 +1738,10 @@ Let's say you have aged key-0 out and new files should be encrypted with key-1:
a1.channels.c1.encryption.activeKey = key-1
a1.channels.c1.encryption.cipherProvider = AESCTRNOPADDING
- a1.channels.c1.encryption.keyProvider = key-provider-0
- a1.channels.c1.encryption.keyProvider.key-provider-0.type = JCEKSFILE
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStoreFile = /path/to/my.keystore
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStorePasswordFile = /path/to/my.keystore.password
- a1.channels.c1.encryption.keyProvider.key-provider-0.keys = key-0 key-1
+ a1.channels.c1.encryption.keyProvider = JCEKSFILE
+ a1.channels.c1.encryption.keyProvider.keyStoreFile = /path/to/my.keystore
+ a1.channels.c1.encryption.keyProvider.keyStorePasswordFile = /path/to/my.keystore.password
+ a1.channels.c1.encryption.keyProvider.keys = key-0 key-1
The same scenerio as above, however key-0 has it's own password:
@@ -1750,12 +1749,11 @@ The same scenerio as above, however key-0 has it's own password:
a1.channels.c1.encryption.activeKey = key-1
a1.channels.c1.encryption.cipherProvider = AESCTRNOPADDING
- a1.channels.c1.encryption.keyProvider = key-provider-0
- a1.channels.c1.encryption.keyProvider.key-provider-0.type = JCEKSFILE
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStoreFile = /path/to/my.keystore
- a1.channels.c1.encryption.keyProvider.key-provider-0.keyStorePasswordFile = /path/to/my.keystore.password
- a1.channels.c1.encryption.keyProvider.key-provider-0.keys = key-0 key-1
- a1.channels.c1.encryption.keyProvider.key-provider-0.keys.key-0.passwordFile = /path/to/key-0.password
+ a1.channels.c1.encryption.keyProvider = JCEKSFILE
+ a1.channels.c1.encryption.keyProvider.keyStoreFile = /path/to/my.keystore
+ a1.channels.c1.encryption.keyProvider.keyStorePasswordFile = /path/to/my.keystore.password
+ a1.channels.c1.encryption.keyProvider.keys = key-0 key-1
+ a1.channels.c1.encryption.keyProvider.keys.key-0.passwordFile = /path/to/key-0.password
Pseudo Transaction Channel