From 518c56def97ea9c941a22e0d6138dde2626f6f06 Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Mon, 28 Feb 2022 22:00:54 +0000 Subject: [PATCH] spiderfoot, editions tweaking --- docker/spiderfoot/Dockerfile | 2 +- docker/spiderfoot/docker-compose.yml | 2 +- etc/compose/collector.yml | 2 +- etc/compose/hive.yml | 2 +- etc/compose/industrial.yml | 2 +- etc/compose/log4j.yml | 2 +- etc/compose/medical.yml | 2 +- etc/compose/mini.yml | 2 +- etc/compose/nextgen.yml | 2 +- etc/compose/standard.yml | 22 +++++++++++++++++++++- iso/installer/install.sh | 1 - 11 files changed, 30 insertions(+), 11 deletions(-) diff --git a/docker/spiderfoot/Dockerfile b/docker/spiderfoot/Dockerfile index e32df0f3..0952dbb2 100644 --- a/docker/spiderfoot/Dockerfile +++ b/docker/spiderfoot/Dockerfile @@ -59,4 +59,4 @@ HEALTHCHECK --retries=10 CMD curl -s -XGET 'http://127.0.0.1:8080/spiderfoot/' # Set user, workdir and start spiderfoot USER spiderfoot:spiderfoot WORKDIR /home/spiderfoot -CMD ["/usr/bin/python3.9", "sf.py","-l", "0.0.0.0:8080"] +CMD echo -n >> /home/spiderfoot/.spiderfoot/spiderfoot.db && exec /usr/bin/python3.9 sf.py -l 0.0.0.0:8080 diff --git a/docker/spiderfoot/docker-compose.yml b/docker/spiderfoot/docker-compose.yml index c2487a02..b81b99b6 100644 --- a/docker/spiderfoot/docker-compose.yml +++ b/docker/spiderfoot/docker-compose.yml @@ -16,4 +16,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/collector.yml b/etc/compose/collector.yml index 1631295a..974e6b6a 100644 --- a/etc/compose/collector.yml +++ b/etc/compose/collector.yml @@ -218,4 +218,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/hive.yml b/etc/compose/hive.yml index 753164e0..a004becc 100644 --- a/etc/compose/hive.yml +++ b/etc/compose/hive.yml @@ -97,4 +97,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml index f28d6e18..87da8387 100644 --- a/etc/compose/industrial.yml +++ b/etc/compose/industrial.yml @@ -389,4 +389,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/log4j.yml b/etc/compose/log4j.yml index 39299f2d..3860ba33 100644 --- a/etc/compose/log4j.yml +++ b/etc/compose/log4j.yml @@ -208,4 +208,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/medical.yml b/etc/compose/medical.yml index 104f2781..c4562969 100644 --- a/etc/compose/medical.yml +++ b/etc/compose/medical.yml @@ -202,4 +202,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/mini.yml b/etc/compose/mini.yml index 9bf572fe..f07dcad7 100644 --- a/etc/compose/mini.yml +++ b/etc/compose/mini.yml @@ -227,4 +227,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index aefe67e7..908805f1 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -533,4 +533,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml index cf14c3f3..138e01a4 100644 --- a/etc/compose/standard.yml +++ b/etc/compose/standard.yml @@ -10,6 +10,7 @@ networks: conpot_local_ipmi: conpot_local_kamstrup_382: cowrie_local: + ddospot_local: dicompot_local: dionaea_local: elasticpot_local: @@ -175,6 +176,25 @@ services: - /data/cowrie/log:/home/cowrie/cowrie/log - /data/cowrie/log/tty:/home/cowrie/cowrie/log/tty +# Ddospot service + ddospot: + container_name: ddospot + restart: always + networks: + - ddospot_local + ports: + - "19:19/udp" + - "53:53/udp" + - "123:123/udp" +# - "161:161/udp" + - "1900:1900/udp" + image: "dtagdevsec/ddospot:2203" + read_only: true + volumes: + - /data/ddospot/log:/opt/ddospot/ddospot/logs + - /data/ddospot/bl:/opt/ddospot/ddospot/bl + - /data/ddospot/db:/opt/ddospot/ddospot/db + # Dicompot service # Get the Horos Client for testing: https://horosproject.org/ # Get Dicom images (CC BY 3.0): https://www.cancerimagingarchive.net/collections/ @@ -619,4 +639,4 @@ services: - "127.0.0.1:64303:8080" image: "dtagdevsec/spiderfoot:2203" volumes: - - /data/spiderfoot/spiderfoot.db:/home/spiderfoot/.spiderfoot/spiderfoot.db + - /data/spiderfoot:/home/spiderfoot/.spiderfoot diff --git a/iso/installer/install.sh b/iso/installer/install.sh index cdeb287c..859de04d 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -848,7 +848,6 @@ mkdir -vp /data/adbhoney/{downloads,log} \ /data/tanner/{log,files} \ /data/p0f/log \ /home/tsec/.ssh/ -touch /data/spiderfoot/spiderfoot.db touch /data/nginx/log/error.log # Let's copy some files