From 39d667ff8d4f5e1c4cf0480971fa986710023ec9 Mon Sep 17 00:00:00 2001 From: Wesley Yarde Date: Wed, 21 Jul 2021 16:51:50 +0200 Subject: [PATCH] Specify env vars consistently via yaml dict syntax --- .../getting-started/docker/docker-compose.yml | 36 +++---- .../docker/elastic-docker-tls.yml | 102 +++++++++--------- .../get-started-docker.asciidoc | 2 +- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/docs/en/getting-started/docker/docker-compose.yml b/docs/en/getting-started/docker/docker-compose.yml index 553794358..069e1c2bf 100644 --- a/docs/en/getting-started/docker/docker-compose.yml +++ b/docs/en/getting-started/docker/docker-compose.yml @@ -4,12 +4,12 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:{version} container_name: es01 environment: - - node.name=es01 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es02,es03 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + node.name: es01 + cluster.name: es-docker-cluster + discovery.seed_hosts: es02,es03 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m ulimits: memlock: soft: -1 @@ -25,12 +25,12 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:{version} container_name: es02 environment: - - node.name=es02 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es01,es03 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + node.name: es02 + cluster.name: es-docker-cluster + discovery.seed_hosts: es01,es03 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m ulimits: memlock: soft: -1 @@ -44,12 +44,12 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:{version} container_name: es03 environment: - - node.name=es03 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es01,es02 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + node.name: es03 + cluster.name: es-docker-cluster + discovery.seed_hosts: es01,es02 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m ulimits: memlock: soft: -1 diff --git a/docs/en/getting-started/docker/elastic-docker-tls.yml b/docs/en/getting-started/docker/elastic-docker-tls.yml index 2fce6a159..3396c8580 100644 --- a/docs/en/getting-started/docker/elastic-docker-tls.yml +++ b/docs/en/getting-started/docker/elastic-docker-tls.yml @@ -5,23 +5,23 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION} container_name: es01 environment: - - node.name=es01 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es02,es03 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - xpack.license.self_generated.type=trial # <1> - - xpack.security.enabled=true - - xpack.security.http.ssl.enabled=true # <2> - - xpack.security.http.ssl.key=$CERTS_DIR/es01/es01.key - - xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.http.ssl.certificate=$CERTS_DIR/es01/es01.crt - - xpack.security.transport.ssl.enabled=true # <3> - - xpack.security.transport.ssl.verification_mode=certificate # <4> - - xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.transport.ssl.certificate=$CERTS_DIR/es01/es01.crt - - xpack.security.transport.ssl.key=$CERTS_DIR/es01/es01.key + node.name: es01 + cluster.name: es-docker-cluster + discovery.seed_hosts: es02,es03 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.license.self_generated.type: trial # <1> + xpack.security.enabled: 'true' + xpack.security.http.ssl.enabled: 'true' # <2> + xpack.security.http.ssl.key: $CERTS_DIR/es01/es01.key + xpack.security.http.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.http.ssl.certificate: $CERTS_DIR/es01/es01.crt + xpack.security.transport.ssl.enabled: 'true' # <3> + xpack.security.transport.ssl.verification_mode: certificate # <4> + xpack.security.transport.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.transport.ssl.certificate: $CERTS_DIR/es01/es01.crt + xpack.security.transport.ssl.key: $CERTS_DIR/es01/es01.key ulimits: memlock: soft: -1 @@ -44,23 +44,23 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION} container_name: es02 environment: - - node.name=es02 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es01,es03 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - xpack.license.self_generated.type=trial - - xpack.security.enabled=true - - xpack.security.http.ssl.enabled=true - - xpack.security.http.ssl.key=$CERTS_DIR/es02/es02.key - - xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.http.ssl.certificate=$CERTS_DIR/es02/es02.crt - - xpack.security.transport.ssl.enabled=true - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.transport.ssl.certificate=$CERTS_DIR/es02/es02.crt - - xpack.security.transport.ssl.key=$CERTS_DIR/es02/es02.key + node.name: es02 + cluster.name: es-docker-cluster + discovery.seed_hosts: es01,es03 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.license.self_generated.type: trial + xpack.security.enabled: 'true' + xpack.security.http.ssl.enabled: 'true' + xpack.security.http.ssl.key: $CERTS_DIR/es02/es02.key + xpack.security.http.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.http.ssl.certificate: $CERTS_DIR/es02/es02.crt + xpack.security.transport.ssl.enabled: 'true' + xpack.security.transport.ssl.verification_mode: certificate + xpack.security.transport.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.transport.ssl.certificate: $CERTS_DIR/es02/es02.crt + xpack.security.transport.ssl.key: $CERTS_DIR/es02/es02.key ulimits: memlock: soft: -1 @@ -75,23 +75,23 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:${VERSION} container_name: es03 environment: - - node.name=es03 - - cluster.name=es-docker-cluster - - discovery.seed_hosts=es01,es02 - - cluster.initial_master_nodes=es01,es02,es03 - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - xpack.license.self_generated.type=trial - - xpack.security.enabled=true - - xpack.security.http.ssl.enabled=true - - xpack.security.http.ssl.key=$CERTS_DIR/es03/es03.key - - xpack.security.http.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.http.ssl.certificate=$CERTS_DIR/es03/es03.crt - - xpack.security.transport.ssl.enabled=true - - xpack.security.transport.ssl.verification_mode=certificate - - xpack.security.transport.ssl.certificate_authorities=$CERTS_DIR/ca/ca.crt - - xpack.security.transport.ssl.certificate=$CERTS_DIR/es03/es03.crt - - xpack.security.transport.ssl.key=$CERTS_DIR/es03/es03.key + node.name: es03 + cluster.name: es-docker-cluster + discovery.seed_hosts: es01,es02 + cluster.initial_master_nodes: es01,es02,es03 + bootstrap.memory_lock: 'true' + ES_JAVA_OPTS: -Xms512m -Xmx512m + xpack.license.self_generated.type: trial + xpack.security.enabled: 'true' + xpack.security.http.ssl.enabled: 'true' + xpack.security.http.ssl.key: $CERTS_DIR/es03/es03.key + xpack.security.http.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.http.ssl.certificate: $CERTS_DIR/es03/es03.crt + xpack.security.transport.ssl.enabled: 'true' + xpack.security.transport.ssl.verification_mode: certificate + xpack.security.transport.ssl.certificate_authorities: $CERTS_DIR/ca/ca.crt + xpack.security.transport.ssl.certificate: $CERTS_DIR/es03/es03.crt + xpack.security.transport.ssl.key: $CERTS_DIR/es03/es03.key ulimits: memlock: soft: -1 diff --git a/docs/en/getting-started/get-started-docker.asciidoc b/docs/en/getting-started/get-started-docker.asciidoc index 732e32c30..956498422 100644 --- a/docs/en/getting-started/get-started-docker.asciidoc +++ b/docs/en/getting-started/get-started-docker.asciidoc @@ -189,7 +189,7 @@ ifeval::["{release-state}"!="unreleased"] ELASTICSEARCH_USERNAME: kibana_system **ELASTICSEARCH_PASSWORD: CHANGEME** ELASTICSEARCH_SSL_CERTIFICATEAUTHORITIES: $CERTS_DIR/ca/ca.crt - SERVER_SSL_ENABLED: "true" + SERVER_SSL_ENABLED: 'true' SERVER_SSL_KEY: $CERTS_DIR/kib01/kib01.key SERVER_SSL_CERTIFICATE: $CERTS_DIR/kib01/kib01.crt volumes: