Rename CONF_DIR to ES_PATH_CONF

This commit is following upstream Elasticsearch which has renamed the environment variable used to specify a custom configuration directory from CONF_DIR to ES_PATH_CONF. Relates elastic/x-pack-elasticsearch#2261 Original commit: elastic/x-pack-elasticsearch@9ae29941e5
2017-08-15 06:19:39 +09:00 · 2017-08-15 06:19:39 +09:00 · f3a7d46698
parent a27dc257c9
commit f3a7d46698
17 changed files with 24 additions and 26 deletions
--- 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=<path>"` or by setting the
-      environment variable `CONF_DIR` via `CONF_DIR=<path>`.
+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=<path>`.
--- 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
                                          <<ldap-role-mapping, YAML role  mapping configuration file>>.
-                                          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
--- 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.
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*
--- 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 \
  "$@"
--- 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 ^
  %*