Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Added environment variables allowing to disable haproxy logging and … #10641

Merged
merged 3 commits into from
Aug 21, 2023
Merged

Added environment variables allowing to disable haproxy logging and … #10641

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbca1a0
Added environment variables allowing to disable haproxy logging and o…
ochriste Aug 16, 2023
bd6a047
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 16, 2023
f9babf7
Requires docker-compose>=1.26.0
sbrunner Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/integrator/docker.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ Config:
* ``TILECLOUDCHAIN_INTERNAL_URL``: Used by the print in non mutualize mode.
* ``ST_JOIN``: Can be ``ST_Collect`` (default) or ``ST_Union``, ``ST_Collect`` is better for performance but
does not support restriction area intersection.
* ``DISABLE_HAPROXY_LOGGING``: Set to # to disable haproxy logging. By default haproxy redirect logs to the
host /dev/log socket and they are visible with journalctl
* ``HAPROXY_LOGGING_OPTIONS``: Allow to overwrite or add new logging options to haproxy.

Geoportal:

Expand Down
6 changes: 2 additions & 4 deletions docker/config/haproxy/haproxy.cfg.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
global
log /dev/log local2
${DISABLE_HAPROXY_LOGGING}log /dev/log local2
maxconn 4000
max-spread-checks 500 #ms between heathchecks of different services
tune.ssl.default-dh-param 2048 # remove warning
Expand All @@ -13,9 +13,7 @@ resolvers dns

defaults
mode http
log global
option httplog
option dontlognull
${HAPROXY_LOGGING_OPTIONS}
option http-server-close
option forwardfor except 127.0.0.0/8
option redispatch
Expand Down
2 changes: 2 additions & 0 deletions .../c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ services:
- AZURE_STORAGE_SAS_TOKEN
- TILEGENERATION_AZURE_CONTAINER
- RASTER_BASE_PATH
- DISABLE_HAPROXY_LOGGING
- HAPROXY_LOGGING_OPTIONS

print:
image: camptocamp/mapfish_print:3.30
Expand Down
5 changes: 5 additions & 0 deletions geoportal/c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ DISABLE_LOCAL=
# For backward compatibility
DISABLE_MUTUALIZED_PRINT=#
DISABLE_LOCAL_PRINT=
# Set DISABLE_HAPROXY_LOGGING to # to disable logging
DISABLE_HAPROXY_LOGGING=
HAPROXY_LOGGING_OPTIONS="log global
option httplog
option dontlognull"

GEOPORTAL_INTERNAL_URL=http://geoportal:8080
GEOPORTAL_INTERNAL_HOST=geoportal
Expand Down