ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-21 21:57:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Agnohendrix 2021-05-18 08:39:16 +02:00 committed by GitHub
commit af98125279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/docker-compose.override.yml-all
View File

@ -204,6 +204,7 @@ services:
ipv4_address: 172.16.238.242 ipv4_address: 172.16.238.242
environment: environment:
- TZ=${TIMEZONE:-UTC} - TZ=${TIMEZONE:-UTC}
- ELASTICSEARCH_HOSTS=http://elastic:9200
- ELASTICSEARCH_URL=http://elastic:9200 - ELASTICSEARCH_URL=http://elastic:9200
depends_on: depends_on:
- elastic - elastic

1
compose/docker-compose.override.yml-elk
View File

@ -53,6 +53,7 @@ services:
ipv4_address: 172.16.238.242 ipv4_address: 172.16.238.242
environment: environment:
- TZ=${TIMEZONE:-UTC} - TZ=${TIMEZONE:-UTC}
- ELASTICSEARCH_HOSTS=http://elastic:9200
- ELASTICSEARCH_URL=http://elastic:9200 - ELASTICSEARCH_URL=http://elastic:9200
depends_on: depends_on:
- elastic - elastic

6
docs/custom-container/enable-varnish.rst
View File

@ -105,7 +105,7 @@ Varnish
+------------------------------+-----------------------------------------------+--------------------------------------------------------------------+ +------------------------------+-----------------------------------------------+--------------------------------------------------------------------+
| ``VARNISH_CONFIG`` | ``/etc/varnish/default.vcl`` | Path to Varnish configuration file (custom config can be mounted). | | ``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. | | ``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 settings
VARNISH_CONFIG=/etc/varnish/default.vcl VARNISH_CONFIG=/etc/varnish/default.vcl
VARNICS_CACHE_SIZE=128m VARNISH_CACHE_SIZE=128m
VARNISH_PARAMS=-p default_ttl=3600 -p default_grace=3600 VARNISH_PARAMS=-p default_ttl=3600 -p default_grace=3600
HOST_PORT_VARNISH=6081 HOST_PORT_VARNISH=6081
@ -245,7 +245,7 @@ directory:
echo "VARNISH_SERVER=6" >> .env echo "VARNISH_SERVER=6" >> .env
echo "# Varnish settings" >> .env echo "# Varnish settings" >> .env
echo "VARNISH_CONFIG=/etc/varnish/default.vcl" >> .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 "VARNISH_PARAMS=-p default_ttl=3600 -p default_grace=3600" >> .env
echo "HOST_PORT_VARNISH=6081" >> .env echo "HOST_PORT_VARNISH=6081" >> .env
echo "# HAProxy settings" >> .env echo "# HAProxy settings" >> .env