From f9ddf48cd3e4aa5d24dbef67af156eb67725452b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Thu, 8 Aug 2024 11:56:20 +0100 Subject: [PATCH] Update iso-prod compose files and syslog-ng config file for them --- misc/dev/docker-compose.autoconf.ui.misc.yml | 4 ++-- misc/dev/docker-compose.autoconf.ui.yml | 4 ++-- misc/dev/docker-compose.autoconf.wizard.yml | 4 ++-- misc/dev/docker-compose.ui.misc.yml | 4 ++-- misc/dev/docker-compose.ui.yml | 4 ++-- misc/dev/docker-compose.wizard.yml | 4 ++-- misc/dev/syslog-ng.conf | 10 +++++++--- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/misc/dev/docker-compose.autoconf.ui.misc.yml b/misc/dev/docker-compose.autoconf.ui.misc.yml index 3c4382e45..0396b515d 100644 --- a/misc/dev/docker-compose.autoconf.ui.misc.yml +++ b/misc/dev/docker-compose.autoconf.ui.misc.yml @@ -102,7 +102,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -168,7 +168,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/docker-compose.autoconf.ui.yml b/misc/dev/docker-compose.autoconf.ui.yml index 26c87ff35..d7b9a6735 100644 --- a/misc/dev/docker-compose.autoconf.ui.yml +++ b/misc/dev/docker-compose.autoconf.ui.yml @@ -99,7 +99,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -164,7 +164,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/docker-compose.autoconf.wizard.yml b/misc/dev/docker-compose.autoconf.wizard.yml index dde57c3fa..98c04877e 100644 --- a/misc/dev/docker-compose.autoconf.wizard.yml +++ b/misc/dev/docker-compose.autoconf.wizard.yml @@ -99,7 +99,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -154,7 +154,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/docker-compose.ui.misc.yml b/misc/dev/docker-compose.ui.misc.yml index e9f8a0ac7..1503d2035 100644 --- a/misc/dev/docker-compose.ui.misc.yml +++ b/misc/dev/docker-compose.ui.misc.yml @@ -82,7 +82,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -126,7 +126,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/docker-compose.ui.yml b/misc/dev/docker-compose.ui.yml index 90788ed76..492c61075 100644 --- a/misc/dev/docker-compose.ui.yml +++ b/misc/dev/docker-compose.ui.yml @@ -79,7 +79,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -123,7 +123,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/docker-compose.wizard.yml b/misc/dev/docker-compose.wizard.yml index 12f55a52c..c40c29936 100644 --- a/misc/dev/docker-compose.wizard.yml +++ b/misc/dev/docker-compose.wizard.yml @@ -73,7 +73,7 @@ services: context: ../.. dockerfile: ./src/ui/Dockerfile volumes: - - bw-logs:/var/log/syslog:ro + - bw-logs:/var/log/bunkerweb - ../../src/ui/src:/usr/share/bunkerweb/ui/src:ro - ../../src/ui/gunicorn.conf.py:/usr/share/bunkerweb/ui/gunicorn.conf.py:ro - ../../src/ui/main.py:/usr/share/bunkerweb/ui/main.py:ro @@ -115,7 +115,7 @@ services: bw-syslog: image: balabit/syslog-ng:4.7.1 volumes: - - bw-logs:/var/log + - bw-logs:/var/log/bunkerweb - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf networks: bw-universe: diff --git a/misc/dev/syslog-ng.conf b/misc/dev/syslog-ng.conf index 3ed5fdf3f..2f85554a2 100644 --- a/misc/dev/syslog-ng.conf +++ b/misc/dev/syslog-ng.conf @@ -16,11 +16,15 @@ template t_imp { # Destination configuration to write logs to dynamically named files destination d_dyna_file { file( - "/var/log/${PROGRAM}.log" + "/var/log/bunkerweb/${PROGRAM}.log" template(t_imp) - owner("root") + owner("101") group("101") - perm(0640) + dir_owner("root") + dir_group("101") + perm(0440) + dir_perm(0770) + create_dirs(yes) ); };