浏览代码

Rename syskeygen

This commit renames syskeygen to elasticsearch-syskeygen
Ryan Ernst 7 年之前
父节点
当前提交
d8636d0fe3

+ 5 - 4
x-pack/docs/en/commands/syskeygen.asciidoc

@@ -1,15 +1,16 @@
 [role="xpack"]
 [[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]
 === Synopsis
 
 [source,shell]
 --------------------------------------------------
-bin/x-pack/syskeygen
+bin/elasticsearch-syskeygen
 [-E <KeyValuePair>] [-h, --help]
 ([-s, --silent] | [-v, --verbose])
 --------------------------------------------------
@@ -46,5 +47,5 @@ default `$ES_HOME/config/x-pack` directory:
 
 [source, sh]
 --------------------------------------------------
-bin/x-pack/syskeygen
+bin/elasticsearch-syskeygen
 --------------------------------------------------

+ 2 - 1
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/crypto/CryptoService.java

@@ -92,7 +92,8 @@ public class CryptoService extends AbstractComponent {
         final byte[] keyBytes = new byte[keySizeBytes];
         final int read = Streams.readFully(in, keyBytes);
         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);
     }

+ 0 - 0
x-pack/plugin/security/src/main/bin/syskeygen → x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen


+ 0 - 0
x-pack/plugin/security/src/main/bin/syskeygen.bat → x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen.bat


+ 1 - 1
x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/EncryptSensitiveDataBootstrapCheck.java

@@ -37,7 +37,7 @@ final class EncryptSensitiveDataBootstrapCheck implements BootstrapCheck {
                         "filesystem.\nRepeat this on every node in the cluster.";
             } else {
                 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() + " " +
                         systemKeyPath + "' to import the key into" +
                         " the secure setting store. Finally, remove the system_key file from the filesystem.\n" +

+ 2 - 2
x-pack/qa/vagrant/src/test/resources/packaging/utils/xpack.bash

@@ -29,8 +29,8 @@ verify_xpack_installation() {
         'elasticsearch-sql-cli'
         '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
-        'syskeygen'
-        'syskeygen.bat'
+        'elasticsearch-syskeygen'
+        'elasticsearch-syskeygen.bat'
         'elasticsearch-users'
         'elasticsearch-users.bat'
         'x-pack-env'