diff --git a/docs/en/installing-xes.asciidoc b/docs/en/installing-xes.asciidoc index 38acf645fe3..3d2181e644d 100644 --- a/docs/en/installing-xes.asciidoc +++ b/docs/en/installing-xes.asciidoc @@ -247,8 +247,6 @@ cd /usr/share/elasticsearch sudo bin/elasticsearch-plugin install x-pack ---------------------------------------------------------- -NOTE: If the configuration files are not in `/etc/elasticsearch` you - need to specify the location of the configuration files by - setting the system property `es.path.conf` to the config path via - `ES_JAVA_OPTS="-Des.path.conf="` or by setting the - environment variable `CONF_DIR` via `CONF_DIR=`. +NOTE: If the configuration files are not in `/etc/elasticsearch` you need to + specify the location of the configuration files by setting the environment + variable `ES_PATH_CONF` via `ES_PATH_CONF=`. diff --git a/docs/en/security/authentication/active-directory-realm.asciidoc b/docs/en/security/authentication/active-directory-realm.asciidoc index 91a9a933db2..bdd159c9537 100644 --- a/docs/en/security/authentication/active-directory-realm.asciidoc +++ b/docs/en/security/authentication/active-directory-realm.asciidoc @@ -286,8 +286,8 @@ operation are supported: failover and load balancing Defaults to `false`. | `files.role_mapping` | no | Specifies the path and file name of the <>. - Defaults to `CONF_DIR/x-pack/role_mapping.yml`, - where `CONF_DIR` is `ES_HOME/config` (zip/tar installations) + Defaults to `ES_PATH_CONF/x-pack/role_mapping.yml`, + where `ES_PATH_CONF` is `ES_HOME/config` (zip/tar installations) or `/etc/elasticsearch` (package installations). | `follow_referrals` | no | Specifies whether {security} should follow referrals returned by the Active Directory server. Referrals are URLs returned by diff --git a/docs/en/security/authorization/mapping-roles.asciidoc b/docs/en/security/authorization/mapping-roles.asciidoc index 86cd76797ca..81d5c984079 100644 --- a/docs/en/security/authorization/mapping-roles.asciidoc +++ b/docs/en/security/authorization/mapping-roles.asciidoc @@ -241,11 +241,11 @@ To use file based role-mappings, you must configure the mappings in a YAML file and copy it to each node in the cluster. Tools like Puppet or Chef can help with this. -By default, role mappings are stored in `CONF_DIR/x-pack/role_mapping.yml`, where -`CONF_DIR` is `ES_HOME/config` (zip/tar installations) or `/etc/elasticsearch` -(package installations). To specify a different location, you configure the -`files.role_mapping` realm settings in `elasticsearch.yml`. This setting enable -you to use a different set of mappings for each realm type: +By default, role mappings are stored in `ES_PATH_CONF/x-pack/role_mapping.yml`, +where `ES_PATH_CONF` is `ES_HOME/config` (zip/tar installations) or +`/etc/elasticsearch` (package installations). To specify a different location, +you configure the `files.role_mapping` realm settings in `elasticsearch.yml`. +This setting enables you to use a different set of mappings for each realm type: |===== | `xpack.security.authc.ldap.files.role_mapping` | | | The location of the role mappings for LDAP realms. diff --git a/plugin/bin/x-pack/certgen b/plugin/bin/x-pack/certgen index 7aa2c2b8eb5..9e64004a405 100644 --- a/plugin/bin/x-pack/certgen +++ b/plugin/bin/x-pack/certgen @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.ssl.CertificateTool \ "$@" diff --git a/plugin/bin/x-pack/certgen.bat b/plugin/bin/x-pack/certgen.bat index aaa89e00888..9b942377286 100644 --- a/plugin/bin/x-pack/certgen.bat +++ b/plugin/bin/x-pack/certgen.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.ssl.CertificateTool ^ %* diff --git a/plugin/bin/x-pack/croneval b/plugin/bin/x-pack/croneval index 0e9284d8fdf..0bca5c2defb 100755 --- a/plugin/bin/x-pack/croneval +++ b/plugin/bin/x-pack/croneval @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool \ "$@" diff --git a/plugin/bin/x-pack/croneval.bat b/plugin/bin/x-pack/croneval.bat index f279ba4c07c..110837d2f9d 100644 --- a/plugin/bin/x-pack/croneval.bat +++ b/plugin/bin/x-pack/croneval.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool ^ %* diff --git a/plugin/bin/x-pack/extension b/plugin/bin/x-pack/extension index aa113ce4e9d..9a2c103bf14 100755 --- a/plugin/bin/x-pack/extension +++ b/plugin/bin/x-pack/extension @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.extensions.XPackExtensionCli \ "$@" diff --git a/plugin/bin/x-pack/extension.bat b/plugin/bin/x-pack/extension.bat index 12cb7ba2f7f..0b40910d2a5 100644 --- a/plugin/bin/x-pack/extension.bat +++ b/plugin/bin/x-pack/extension.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.extensions.XPackExtensionCli ^ %* diff --git a/plugin/bin/x-pack/migrate b/plugin/bin/x-pack/migrate index 6bf8f12bfcf..640363d8815 100755 --- a/plugin/bin/x-pack/migrate +++ b/plugin/bin/x-pack/migrate @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool \ "$@" diff --git a/plugin/bin/x-pack/migrate.bat b/plugin/bin/x-pack/migrate.bat index 16c7e65863c..ee4d9f94e7a 100644 --- a/plugin/bin/x-pack/migrate.bat +++ b/plugin/bin/x-pack/migrate.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool ^ %* diff --git a/plugin/bin/x-pack/setup-passwords b/plugin/bin/x-pack/setup-passwords index 17d9a24c0ae..d434271c834 100644 --- a/plugin/bin/x-pack/setup-passwords +++ b/plugin/bin/x-pack/setup-passwords @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool \ "$@" diff --git a/plugin/bin/x-pack/setup-passwords.bat b/plugin/bin/x-pack/setup-passwords.bat index 160b8275353..9b94dcbd24a 100644 --- a/plugin/bin/x-pack/setup-passwords.bat +++ b/plugin/bin/x-pack/setup-passwords.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool ^ %* diff --git a/plugin/bin/x-pack/syskeygen b/plugin/bin/x-pack/syskeygen index 2536995600b..b03c299e77d 100755 --- a/plugin/bin/x-pack/syskeygen +++ b/plugin/bin/x-pack/syskeygen @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool \ "$@" diff --git a/plugin/bin/x-pack/syskeygen.bat b/plugin/bin/x-pack/syskeygen.bat index 153b3d009d8..ad486fd1212 100644 --- a/plugin/bin/x-pack/syskeygen.bat +++ b/plugin/bin/x-pack/syskeygen.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool ^ %* diff --git a/plugin/bin/x-pack/users b/plugin/bin/x-pack/users index 53a0a740aed..8729cdb3910 100755 --- a/plugin/bin/x-pack/users +++ b/plugin/bin/x-pack/users @@ -12,7 +12,7 @@ exec \ "$JAVA" \ $ES_JAVA_OPTS \ -Des.path.home="$ES_HOME" \ - -Des.path.conf="$CONF_DIR" \ + -Des.path.conf="$ES_PATH_CONF" \ -cp "$ES_CLASSPATH" \ org.elasticsearch.xpack.security.authc.file.tool.UsersTool \ "$@" diff --git a/plugin/bin/x-pack/users.bat b/plugin/bin/x-pack/users.bat index 2284afbd5d3..7001fb28003 100644 --- a/plugin/bin/x-pack/users.bat +++ b/plugin/bin/x-pack/users.bat @@ -13,7 +13,7 @@ call "%~dp0x-pack-env.bat" || exit /b 1 %JAVA% ^ %ES_JAVA_OPTS% ^ -Des.path.home="%ES_HOME%" ^ - -Des.path.conf="%CONF_DIR%" ^ + -Des.path.conf="%ES_PATH_CONF%" ^ -cp "%ES_CLASSPATH%" ^ org.elasticsearch.xpack.security.authc.file.tool.UsersTool ^ %*