fix nginx merge conflicts

2026-04-25 14:07:49 +02:00 · 2023-05-15 11:40:12 -04:00
parent db47256cdd 9a3c997779
commit 7a4fea7a12
46 changed files with 234 additions and 174 deletions
@@ -40,18 +40,6 @@ logstash:
    custom2: []
    custom3: []
    custom4: []
-  docker_options:
-    port_bindings:
-      - 0.0.0.0:3765:3765
-      - 0.0.0.0:5044:5044
-      - 0.0.0.0:5055:5055
-      - 0.0.0.0:5056:5056
-      - 0.0.0.0:5644:5644
-      - 0.0.0.0:6050:6050
-      - 0.0.0.0:6051:6051
-      - 0.0.0.0:6052:6052
-      - 0.0.0.0:6053:6053
-      - 0.0.0.0:9600:9600
  settings:
    lsheap: 500m
  config: