From 059d877c488de7cc5aa1149574f8fe32c5845fa5 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 4 Mar 2024 17:54:13 +0800 Subject: [PATCH] update maltrail --- maltrail/README.md | 5 +++-- maltrail/data/etc/maltrail.conf | 4 ++-- maltrail/data/{ => sensor}/log/.gitkeep | 0 maltrail/data/{var => server/log}/.gitkeep | 0 maltrail/docker-compose.yml | 10 ++++------ 5 files changed, 9 insertions(+), 10 deletions(-) rename maltrail/data/{ => sensor}/log/.gitkeep (100%) rename maltrail/data/{var => server/log}/.gitkeep (100%) diff --git a/maltrail/README.md b/maltrail/README.md index bb6c575..6dcc557 100644 --- a/maltrail/README.md +++ b/maltrail/README.md @@ -6,12 +6,13 @@ maltrail ```bash $ docker compose up -d -$ curl http://127.0.0.1:8338 +$ curl http://127.0.0.1:8338 # admin:changeme! +$ less data/etc/maltrail.csv $ ping -c 1 136.161.101.53 $ nslookup morphed.ru -$ tail -f ./data/log/$(date +"%Y-%m-%d").log +$ tail -f ./data/server/log/$(date +"%Y-%m-%d").log ``` [1]: https://github.com/stamparm/maltrail diff --git a/maltrail/data/etc/maltrail.conf b/maltrail/data/etc/maltrail.conf index 83c4f39..b8f5219 100644 --- a/maltrail/data/etc/maltrail.conf +++ b/maltrail/data/etc/maltrail.conf @@ -138,7 +138,7 @@ CHECK_HOST_DOMAINS false SHOW_DEBUG false # Directory used for log storage -LOG_DIR ./log/maltrail +LOG_DIR ./log # HTTP(s) proxy address #PROXY_ADDRESS http://192.168.5.101:8118 @@ -147,4 +147,4 @@ LOG_DIR ./log/maltrail DISABLE_CHECK_SUDO true # Override default location for trail storage (~/.maltrail/trails.csv) -TRAILS_FILE ./var/maltrail.csv +TRAILS_FILE ./etc/maltrail.csv diff --git a/maltrail/data/log/.gitkeep b/maltrail/data/sensor/log/.gitkeep similarity index 100% rename from maltrail/data/log/.gitkeep rename to maltrail/data/sensor/log/.gitkeep diff --git a/maltrail/data/var/.gitkeep b/maltrail/data/server/log/.gitkeep similarity index 100% rename from maltrail/data/var/.gitkeep rename to maltrail/data/server/log/.gitkeep diff --git a/maltrail/docker-compose.yml b/maltrail/docker-compose.yml index 27cd717..1cb775f 100644 --- a/maltrail/docker-compose.yml +++ b/maltrail/docker-compose.yml @@ -5,21 +5,19 @@ services: maltrail-server: image: vimagick/maltrail command: ./server.py -c etc/maltrail.conf - container_name: maltrail-server volumes: - ./data/etc:/opt/maltrail/etc - - ./data/log:/opt/maltrail/log - - ./data/var:/opt/maltrail/var + - ./data/server/log:/opt/maltrail/log network_mode: host restart: unless-stopped maltrail-sensor: image: vimagick/maltrail command: ./sensor.py -c etc/maltrail.conf - container_name: maltrail-sensor volumes: - ./data/etc:/opt/maltrail/etc - - ./data/log:/opt/maltrail/log - - ./data/var:/opt/maltrail/var + - ./data/sensor/log:/opt/maltrail/log network_mode: host + depends_on: + - maltrail-server restart: unless-stopped