update maltrail

vimagick · Mar 4, 2024 · 059d877 · 059d877
1 parent b99c8d4
commit 059d877
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git 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
@@ -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 → maltrail/data/sensor/log/.gitkeep b/maltrail/data/log/.gitkeep → maltrail/data/sensor/log/.gitkeep
diff --git a/maltrail/data/var/.gitkeep → maltrail/data/server/log/.gitkeep b/maltrail/data/var/.gitkeep → maltrail/data/server/log/.gitkeep
diff --git 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