#1531, but needs testing

This commit is contained in:
Marco Ochse 2024-05-02 13:43:16 +02:00
parent 775bc2c1dd
commit caca93f3a0
2 changed files with 18 additions and 15 deletions

View file

@ -21,6 +21,7 @@ networks:
medpot_local: medpot_local:
redishoneypot_local: redishoneypot_local:
sentrypeer_local: sentrypeer_local:
suricata_local:
tanner_local: tanner_local:
wordpot_local: wordpot_local:
nginx_local: nginx_local:
@ -250,7 +251,7 @@ services:
- ddospot_local - ddospot_local
ports: ports:
- "19:19/udp" - "19:19/udp"
- "53:53/udp" # - "53:53/udp"
- "123:123/udp" - "123:123/udp"
# - "161:161/udp" # - "161:161/udp"
- "1900:1900/udp" - "1900:1900/udp"
@ -616,15 +617,16 @@ services:
depends_on: depends_on:
tpotinit: tpotinit:
condition: service_healthy condition: service_healthy
environment: networks:
- OINKCODE=${OINKCODE:-OPEN} # Default to OPEN if unset or NULL (value provided by T-Pot .env) - suricata_local
# Loading external Rules from URL
# - FROMURL="https://username:password@yoururl.com|https://username:password@otherurl.com"
network_mode: "host"
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
- SYS_NICE - SYS_NICE
- NET_RAW - NET_RAW
environment:
- OINKCODE=${OINKCODE:-OPEN} # Default to OPEN if unset or NULL (value provided by T-Pot .env)
# Loading external Rules from URL
# - FROMURL="https://username:password@yoururl.com|https://username:password@otherurl.com"
image: ${TPOT_REPO}/suricata:${TPOT_VERSION} image: ${TPOT_REPO}/suricata:${TPOT_VERSION}
pull_policy: ${TPOT_PULL_POLICY} pull_policy: ${TPOT_PULL_POLICY}
volumes: volumes:

View file

@ -165,15 +165,15 @@ if [ "${myOSTYPE}" == "linuxkit" ] && [ "${TPOT_OSTYPE}" == "linux" ];
echo "# Aborting." echo "# Aborting."
echo echo
exit 1 exit 1
else fi
if ! [ -S /var/run/docker.sock ];
if ! [ "${myOSTYPE}" == "linuxkit" ] && ! [ -S /var/run/docker.sock ];
then then
echo "# Cannot access /var/run/docker.sock, check docker-compose.yml for proper volume definition." echo "# Cannot access /var/run/docker.sock, check docker-compose.yml for proper volume definition."
echo echo
echo "# Aborting." echo "# Aborting."
exit 1 exit 1
fi fi
fi
# Validate environment variables # Validate environment variables
for var in TPOT_BLACKHOLE TPOT_PERSISTENCE TPOT_ATTACKMAP_TEXT TPOT_ATTACKMAP_TEXT_TIMEZONE TPOT_REPO TPOT_VERSION TPOT_PULL_POLICY TPOT_OSTYPE; for var in TPOT_BLACKHOLE TPOT_PERSISTENCE TPOT_ATTACKMAP_TEXT TPOT_ATTACKMAP_TEXT_TIMEZONE TPOT_REPO TPOT_VERSION TPOT_PULL_POLICY TPOT_OSTYPE;
@ -351,4 +351,5 @@ if [ "${myOSTYPE}" != "linuxkit" ];
echo echo
echo "# Docker Desktop for macOS or Windows detected, Conntrack feature is not supported." echo "# Docker Desktop for macOS or Windows detected, Conntrack feature is not supported."
echo echo
sleep infinity
fi fi