Skip to content

Commit

Permalink
[DOCS] Remove unneeded ifdef::asciidoctor[] conditionals (#42758)
Browse files Browse the repository at this point in the history
    Several `ifdef::asciidoctor` conditionals were added so that AsciiDoc
    and Asciidoctor doc builds rendered consistently.

    With elastic/docs#827, Elasticsearch Reference
    documentation migrated completely to Asciidoctor. We no longer need to
    support AsciiDoc so we can remove these conditionals.

    Resolves #41722
  • Loading branch information
jrodewig committed May 31, 2019
1 parent 3c2bd6e commit 98da84e
Showing 1 changed file with 0 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ endif::[]

ifeval::["{release-state}"!="unreleased"]

ifdef::asciidoctor[]
["source","yaml",subs="attributes"]
----
version: '2.2'
Expand All @@ -86,32 +85,6 @@ services:
working_dir: /usr/share/elasticsearch
volumes: ['.:/usr/share/elasticsearch/config/certificates']
----
endif::[]
ifndef::asciidoctor[]
["source","yaml",subs="attributes"]
----
version: '2.2'
services:
create_certs:
container_name: create_certs
image: {docker-image}
command: >
bash -c '
if [[ ! -d config/certificates/certs ]]; then
mkdir config/certificates/certs;
fi;
if [[ ! -f /local/certs/bundle.zip ]]; then
bin/elasticsearch-certgen --silent --in config/certificates/instances.yml --out config/certificates/certs/bundle.zip;
unzip config/certificates/certs/bundle.zip -d config/certificates/certs; <1>
fi;
chgrp -R 0 config/certificates/certs
'
user: $\{UID:-1000\}
working_dir: /usr/share/elasticsearch
volumes: ['.:/usr/share/elasticsearch/config/certificates']
----
endif::[]

<1> The new node certificates and CA certificate+key are placed under the local directory `certs`.
endif::[]
Expand Down

0 comments on commit 98da84e

Please sign in to comment.