docs: remove configuration path setting from plugin install commands

The additional setting to specify the configuration path is no longer needed with elasticsearch 2.0, so
we should remove it from the documentation. Also cleans up the installation commands to be in line
with what 2.0 requires.

Original commit: elastic/x-pack-elasticsearch@b269568a67
This commit is contained in:
jaymode 2015-10-21 07:14:34 -04:00
parent 45d0ea6014
commit f5e9c826b4
3 changed files with 10 additions and 15 deletions

View File

@ -24,7 +24,7 @@ bin/plugin install license
bin/plugin install shield
----------------------------------------------------------
+
NOTE: If you are using a <<deb-rpm-install, DEB/RPM distribution>> of Elasticsearch, you need to specify the configuration directory and run the installation with superuser permissions. To perform an offline installation, <<offline-install,download the Shield binaries>>.
NOTE: If you are using a <<deb-rpm-install, DEB/RPM distribution>> of Elasticsearch, you need to run the installation with superuser permissions. To perform an offline installation, <<offline-install,download the Shield binaries>>.
. Start Elasticsearch.
+

View File

@ -27,19 +27,15 @@ complete list of default paths, see {ref}/setup-dir-layout.html#_deb_and_rpm[Dir
the Elasticsearch Reference.)
To install the Shield and License plugins on a DEB/RPM package installation, you need to run
`bin/plugin -i` from the `/usr/share/elasticsearch` directory with superuser permissions, and
specify the location of the configuration files by setting `-Des.path.conf`. For example:
`bin/plugin -i` from the `/usr/share/elasticsearch` directory with superuser permissions. For example:
[source,shell]
----------------------------------------------------------
cd /usr/share/elasticsearch
sudo bin/plugin -i elasticsearch/license/latest -Des.path.conf=/etc/elasticsearch
sudo bin/plugin -i elasticsearch/shield/latest -Des.path.conf=/etc/elasticsearch
sudo bin/plugin -i license
sudo bin/plugin -i shield
----------------------------------------------------------
NOTE: If you are using a version of Shield prior to 1.3, you also need to specify the location
of the configuration files when running `esusers` and `syskeygen`.
[float]
[[offline-install]]
=== Installing Shield on Offline Machines
@ -62,8 +58,8 @@ To install Shield on a machine that doesn't have Internet access:
+
[source,shell]
----------------------------------------------------------
bin/plugin -i license -u file:///path/to/file/license-2.1.0.zip <1>
bin/plugin -i shield -u file:///path/to/file/shield-2.1.0.zip
bin/plugin install file:///path/to/file/license-2.1.0.zip <1>
bin/plugin install file:///path/to/file/shield-2.1.0.zip
----------------------------------------------------------
<1> Note that you must specify an absolute path to the zip file after the `file://` protocol.

View File

@ -68,14 +68,13 @@ complete list of default paths, see {ref}/setup-dir-layout.html#_deb_and_rpm[Dir
the Elasticsearch Reference.)
To install the Watcher and License plugins on a DEB/RPM package installation, you need to run
`bin/plugin -i` from the `/usr/share/elasticsearch` directory with superuser permissions, and
specify the location of the configuration files by setting `-Des.path.conf`. For example:
`bin/plugin -i` from the `/usr/share/elasticsearch` directory with superuser permissions. For example:
[source,shell]
----------------------------------------------------------
cd /usr/share/elasticsearch
sudo bin/plugin -i license -Des.path.conf=/etc/elasticsearch
sudo bin/plugin -i watcher -Des.path.conf=/etc/elasticsearch
sudo bin/plugin -i license
sudo bin/plugin -i watcher
----------------------------------------------------------
[float]
@ -97,6 +96,6 @@ https://download.elastic.co/elasticsearch/license/license-latest.zip]
+
[source,shell]
----------------------------------------------------------
bin/plugin -i watcher -u file:///path/to/file/watcher-{version}.zip <1>
bin/plugin install file:///path/to/file/watcher-{version}.zip <1>
----------------------------------------------------------
<1> Note that you must specify an absolute path to the zip file after the `file://` protocol.