Rename syskeygen

This commit renames syskeygen to elasticsearch-syskeygen
This commit is contained in:
Ryan Ernst 2018-04-11 08:41:22 -07:00
parent c7c0e330b8
commit d8636d0fe3
6 changed files with 10 additions and 8 deletions

View File

@ -1,15 +1,16 @@
[role="xpack"] [role="xpack"]
[[syskeygen]] [[syskeygen]]
== syskeygen == elasticsearch-syskeygen
The `syskeygen` command creates a system key file in `CONFIG_DIR/x-pack`. The `elasticsearch-syskeygen` command creates a system key file in the
elasticsearch config directory.
[float] [float]
=== Synopsis === Synopsis
[source,shell] [source,shell]
-------------------------------------------------- --------------------------------------------------
bin/x-pack/syskeygen bin/elasticsearch-syskeygen
[-E <KeyValuePair>] [-h, --help] [-E <KeyValuePair>] [-h, --help]
([-s, --silent] | [-v, --verbose]) ([-s, --silent] | [-v, --verbose])
-------------------------------------------------- --------------------------------------------------
@ -46,5 +47,5 @@ default `$ES_HOME/config/x-pack` directory:
[source, sh] [source, sh]
-------------------------------------------------- --------------------------------------------------
bin/x-pack/syskeygen bin/elasticsearch-syskeygen
-------------------------------------------------- --------------------------------------------------

View File

@ -92,7 +92,8 @@ public class CryptoService extends AbstractComponent {
final byte[] keyBytes = new byte[keySizeBytes]; final byte[] keyBytes = new byte[keySizeBytes];
final int read = Streams.readFully(in, keyBytes); final int read = Streams.readFully(in, keyBytes);
if (read != keySizeBytes) { if (read != keySizeBytes) {
throw new IllegalArgumentException("key size did not match expected value; was the key generated with syskeygen?"); throw new IllegalArgumentException(
"key size did not match expected value; was the key generated with elasticsearch-syskeygen?");
} }
return new SecretKeySpec(keyBytes, KEY_ALGO); return new SecretKeySpec(keyBytes, KEY_ALGO);
} }

View File

@ -37,7 +37,7 @@ final class EncryptSensitiveDataBootstrapCheck implements BootstrapCheck {
"filesystem.\nRepeat this on every node in the cluster."; "filesystem.\nRepeat this on every node in the cluster.";
} else { } else {
message = "Encryption of sensitive data requires a key to be placed in the secure setting store. First run the " + message = "Encryption of sensitive data requires a key to be placed in the secure setting store. First run the " +
"bin/x-pack/syskeygen tool to generate a key file.\nThen run 'bin/elasticsearch-keystore add-file " + "bin/elasticsearch-syskeygen tool to generate a key file.\nThen run 'bin/elasticsearch-keystore add-file " +
WatcherField.ENCRYPTION_KEY_SETTING.getKey() + " " + WatcherField.ENCRYPTION_KEY_SETTING.getKey() + " " +
systemKeyPath + "' to import the key into" + systemKeyPath + "' to import the key into" +
" the secure setting store. Finally, remove the system_key file from the filesystem.\n" + " the secure setting store. Finally, remove the system_key file from the filesystem.\n" +

View File

@ -29,8 +29,8 @@ verify_xpack_installation() {
'elasticsearch-sql-cli' 'elasticsearch-sql-cli'
'elasticsearch-sql-cli.bat' 'elasticsearch-sql-cli.bat'
"elasticsearch-sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it "elasticsearch-sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it
'syskeygen' 'elasticsearch-syskeygen'
'syskeygen.bat' 'elasticsearch-syskeygen.bat'
'elasticsearch-users' 'elasticsearch-users'
'elasticsearch-users.bat' 'elasticsearch-users.bat'
'x-pack-env' 'x-pack-env'