From 87e710050f64cec9937e389d0f8f4276575ce75e Mon Sep 17 00:00:00 2001 From: kovach Date: Thu, 4 Feb 2021 22:49:29 +0100 Subject: [PATCH 1/4] Update enable-varnish.rst fix small typo --- docs/custom-container/enable-varnish.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/custom-container/enable-varnish.rst b/docs/custom-container/enable-varnish.rst index 856a3a47..2109d77f 100644 --- a/docs/custom-container/enable-varnish.rst +++ b/docs/custom-container/enable-varnish.rst @@ -105,7 +105,7 @@ Varnish +------------------------------+-----------------------------------------------+--------------------------------------------------------------------+ | ``VARNISH_CONFIG`` | ``/etc/varnish/default.vcl`` | Path to Varnish configuration file (custom config can be mounted). | +------------------------------+-----------------------------------------------+--------------------------------------------------------------------+ -| ``VARNICS_CACHE_SIZE`` | ``128m`` | Varnish Cache size. | +| ``VARNISH_CACHE_SIZE`` | ``128m`` | Varnish Cache size. | +------------------------------+-----------------------------------------------+--------------------------------------------------------------------+ | ``VARNISH_PARAMS`` | ``-p default_ttl=3600 -p default_grace=3600`` | Additional Varnish startup parameter. | +------------------------------+-----------------------------------------------+--------------------------------------------------------------------+ @@ -158,7 +158,7 @@ Add the following variables to ``.env`` and adjust them to your needs: # Varnish settings VARNISH_CONFIG=/etc/varnish/default.vcl - VARNICS_CACHE_SIZE=128m + VARNISH_CACHE_SIZE=128m VARNISH_PARAMS=-p default_ttl=3600 -p default_grace=3600 HOST_PORT_VARNISH=6081 @@ -245,7 +245,7 @@ directory: echo "VARNISH_SERVER=6" >> .env echo "# Varnish settings" >> .env echo "VARNISH_CONFIG=/etc/varnish/default.vcl" >> .env - echo "VARNICS_CACHE_SIZE=128m" >> .env + echo "VARNISH_CACHE_SIZE=128m" >> .env echo "VARNISH_PARAMS=-p default_ttl=3600 -p default_grace=3600" >> .env echo "HOST_PORT_VARNISH=6081" >> .env echo "# HAProxy settings" >> .env From 56342426b3ec1dd1975ba96de1c9b8e3585ade63 Mon Sep 17 00:00:00 2001 From: Mark Hodge Date: Thu, 11 Feb 2021 08:48:18 -0600 Subject: [PATCH 2/4] Kibana 6.6 and above uses ELASTICSEARCH_HOSTS --- compose/docker-compose.override.yml-all | 2 +- compose/docker-compose.override.yml-elk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compose/docker-compose.override.yml-all b/compose/docker-compose.override.yml-all index bd301bbe..64284850 100644 --- a/compose/docker-compose.override.yml-all +++ b/compose/docker-compose.override.yml-all @@ -204,7 +204,7 @@ services: ipv4_address: 172.16.238.242 environment: - TZ=${TIMEZONE:-UTC} - - ELASTICSEARCH_URL=http://elastic:9200 + - ELASTICSEARCH_HOSTS=http://elastic:9200 depends_on: - elastic diff --git a/compose/docker-compose.override.yml-elk b/compose/docker-compose.override.yml-elk index f669f096..79a3afef 100644 --- a/compose/docker-compose.override.yml-elk +++ b/compose/docker-compose.override.yml-elk @@ -53,7 +53,7 @@ services: ipv4_address: 172.16.238.242 environment: - TZ=${TIMEZONE:-UTC} - - ELASTICSEARCH_URL=http://elastic:9200 + - ELASTICSEARCH_HOSTS=http://elastic:9200 depends_on: - elastic From d5e463db60f315e9cc0df85c3dd8ec60a5ae465b Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 19 Apr 2021 18:10:36 +0200 Subject: [PATCH 3/4] Update compose/docker-compose.override.yml-all --- compose/docker-compose.override.yml-all | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/docker-compose.override.yml-all b/compose/docker-compose.override.yml-all index 64284850..9fe7d70a 100644 --- a/compose/docker-compose.override.yml-all +++ b/compose/docker-compose.override.yml-all @@ -205,6 +205,7 @@ services: environment: - TZ=${TIMEZONE:-UTC} - ELASTICSEARCH_HOSTS=http://elastic:9200 + - ELASTICSEARCH_URL=http://elastic:9200 depends_on: - elastic From db1be8147103fcbf982d76019042ca93634e58a4 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 19 Apr 2021 18:10:43 +0200 Subject: [PATCH 4/4] Update compose/docker-compose.override.yml-elk --- compose/docker-compose.override.yml-elk | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/docker-compose.override.yml-elk b/compose/docker-compose.override.yml-elk index 79a3afef..29b1bef1 100644 --- a/compose/docker-compose.override.yml-elk +++ b/compose/docker-compose.override.yml-elk @@ -54,6 +54,7 @@ services: environment: - TZ=${TIMEZONE:-UTC} - ELASTICSEARCH_HOSTS=http://elastic:9200 + - ELASTICSEARCH_URL=http://elastic:9200 depends_on: - elastic