diff --git a/etc/compose/collect.yml b/etc/compose/collect.yml index d4d86b1d..2a16bbbb 100644 --- a/etc/compose/collect.yml +++ b/etc/compose/collect.yml @@ -162,7 +162,6 @@ services: # Spiderfoot service spiderfoot: - build: . container_name: spiderfoot restart: always networks: diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 7da00ea1..44854232 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -98,10 +98,11 @@ EOF # Install types are TPOT, HP, INDUSTRIAL, ALL tput cnorm myFLAVOR=$(dialog --no-cancel --backtitle "$myBACKTITLE" --title "[ Choose your edition ]" --no-tags --menu \ -"\nRequired: 4GB RAM, 64GB disk\nRecommended: 8GB RAM, 128GB SSD" 14 60 4 \ +"\nRequired: 4GB RAM, 64GB disk\nRecommended: 8GB RAM, 128GB SSD" 14 60 5 \ "TPOT" "Standard Honeypots, Suricata & ELK" \ "HP" "Honeypots only, w/o Suricata & ELK" \ -"INDUSTRIAL" "Conpot, eMobility, Suricata & ELK" \ +"COLLECTOR" "Heralding, Honeytrap & ELK" \ +"INDUSTRIAL" "Conpot, Suricata & ELK" \ "EVERYTHING" "Everything" 3>&1 1>&2 2>&3 3>&-) # Let's ask for a secure tsec password @@ -355,6 +356,10 @@ EOF # Let's make sure only myFLAVOR images will be downloaded and started case $myFLAVOR in + COLLECTOR) + echo "### Preparing COLLECTOR flavor installation." + cp /opt/tpot/etc/compose/collect.yml $myTPOTCOMPOSE 2>&1>/dev/null + ;; HP) echo "### Preparing HONEYPOT flavor installation." cp /opt/tpot/etc/compose/hp.yml $myTPOTCOMPOSE 2>&1>/dev/null