Fix conditional coding to use prerelease state

Fixes #8653
This commit is contained in:
DeDe Morton 2017-11-13 10:21:40 -08:00
parent 0bc80e38a7
commit 0a18206524

View file

@ -93,13 +93,32 @@ You may need to install the `apt-transport-https` package on Debian before proce
sudo apt-get install apt-transport-https
--------------------------------------------------
// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == released
ifeval::["{release-state}"=="released"]
Save the repository definition to +/etc/apt/sources.list.d/elastic-{major-version}.list+:
["source","sh",subs="attributes,callouts"]
["source","sh",subs="attributes"]
--------------------------------------------------
echo "deb https://artifacts.elastic.co/packages/{major-version}/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}.list
--------------------------------------------------
endif::[]
// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == prerelase
ifeval::["{release-state}"=="prerelease"]
Save the repository definition to +/etc/apt/sources.list.d/elastic-{major-version}-prerelease.list+:
["source","sh",subs="attributes"]
--------------------------------------------------
echo "deb https://artifacts.elastic.co/packages/{major-version}-prerelease/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-{major-version}-prerelease.list
--------------------------------------------------
endif::[]
[WARNING]
==================================================
Use the `echo` method described above to add the Logstash repository. Do not
@ -146,7 +165,11 @@ rpm --import https://artifacts.elastic.co/GPG-KEY-elasticsearch
Add the following in your `/etc/yum.repos.d/` directory
in a file with a `.repo` suffix, for example `logstash.repo`
["source","sh",subs="attributes,callouts"]
// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == prerelase
ifeval::["{release-state}"=="prerelease"]
["source","sh",subs="attributes"]
--------------------------------------------------
[logstash-{major-version}]
name=Elastic repository for {major-version} packages
@ -158,6 +181,26 @@ autorefresh=1
type=rpm-md
--------------------------------------------------
endif::[]
// THIS IS A NESTED STATEMENT - This block executes if release-state != unreleased and release-state == released
ifeval::["{release-state}"=="released"]
["source","sh",subs="attributes"]
--------------------------------------------------
[logstash-{major-version}]
name=Elastic repository for {major-version} packages
baseurl=https://artifacts.elastic.co/packages/{major-version}/yum
gpgcheck=1
gpgkey=https://artifacts.elastic.co/GPG-KEY-elasticsearch
enabled=1
autorefresh=1
type=rpm-md
--------------------------------------------------
endif::[]
And your repository is ready for use. You can install it with:
[source,sh]