diff --git a/docker/honeysap/Dockerfile b/docker/deprecated/honeysap/Dockerfile similarity index 100% rename from docker/honeysap/Dockerfile rename to docker/deprecated/honeysap/Dockerfile diff --git a/docker/honeysap/dist/external_route_table.yml b/docker/deprecated/honeysap/dist/external_route_table.yml similarity index 100% rename from docker/honeysap/dist/external_route_table.yml rename to docker/deprecated/honeysap/dist/external_route_table.yml diff --git a/docker/honeysap/dist/honeysap.yml b/docker/deprecated/honeysap/dist/honeysap.yml similarity index 100% rename from docker/honeysap/dist/honeysap.yml rename to docker/deprecated/honeysap/dist/honeysap.yml diff --git a/docker/honeysap/docker-compose.yml b/docker/deprecated/honeysap/docker-compose.yml similarity index 100% rename from docker/honeysap/docker-compose.yml rename to docker/deprecated/honeysap/docker-compose.yml diff --git a/docker/rdpy/Dockerfile b/docker/deprecated/rdpy/Dockerfile similarity index 100% rename from docker/rdpy/Dockerfile rename to docker/deprecated/rdpy/Dockerfile diff --git a/docker/rdpy/dist/1 b/docker/deprecated/rdpy/dist/1 similarity index 100% rename from docker/rdpy/dist/1 rename to docker/deprecated/rdpy/dist/1 diff --git a/docker/rdpy/dist/2 b/docker/deprecated/rdpy/dist/2 similarity index 100% rename from docker/rdpy/dist/2 rename to docker/deprecated/rdpy/dist/2 diff --git a/docker/rdpy/dist/3 b/docker/deprecated/rdpy/dist/3 similarity index 100% rename from docker/rdpy/dist/3 rename to docker/deprecated/rdpy/dist/3 diff --git a/docker/rdpy/docker-compose.yml b/docker/deprecated/rdpy/docker-compose.yml similarity index 100% rename from docker/rdpy/docker-compose.yml rename to docker/deprecated/rdpy/docker-compose.yml diff --git a/etc/compose/hive_sensor.yml b/etc/compose/hive_sensor.yml index 63553562..79e5ac20 100644 --- a/etc/compose/hive_sensor.yml +++ b/etc/compose/hive_sensor.yml @@ -15,11 +15,9 @@ networks: dionaea_local: elasticpot_local: heralding_local: - honeysap_local: logstash_local: mailoney_local: medpot_local: - rdpy_local: tanner_local: ewsposter_local: @@ -274,18 +272,6 @@ services: volumes: - /data/heralding/log:/var/log/heralding -# HoneySAP service - honeysap: - container_name: honeysap - restart: always - networks: - - honeysap_local - ports: - - "3299:3299" - image: "dtagdevsec/honeysap:2203" - volumes: - - /data/honeysap/log:/opt/honeysap/log - # Honeytrap service honeytrap: container_name: honeytrap @@ -334,27 +320,6 @@ services: volumes: - /data/medpot/log/:/var/log/medpot -# Rdpy service - rdpy: - container_name: rdpy - extra_hosts: - - hpfeeds.example.com:127.0.0.1 - restart: always - environment: - - HPFEEDS_SERVER=hpfeeds.example.com - - HPFEEDS_IDENT=user - - HPFEEDS_SECRET=pass - - HPFEEDS_PORT=65000 - - SERVERID=id - networks: - - rdpy_local - ports: - - "3389:3389" - image: "dtagdevsec/rdpy:2203" - read_only: true - volumes: - - /data/rdpy/log:/var/log/rdpy - #### Snare / Tanner ## Tanner Redis Service tanner_redis: diff --git a/etc/compose/industrial.yml b/etc/compose/industrial.yml index e787ddf1..f28d6e18 100644 --- a/etc/compose/industrial.yml +++ b/etc/compose/industrial.yml @@ -11,9 +11,7 @@ networks: cowrie_local: dicompot_local: heralding_local: - honeysap_local: medpot_local: - rdpy_local: ewsposter_local: spiderfoot_local: @@ -204,18 +202,6 @@ services: volumes: - /data/heralding/log:/var/log/heralding -# HoneySAP service - honeysap: - container_name: honeysap - restart: always - networks: - - honeysap_local - ports: - - "3299:3299" - image: "dtagdevsec/honeysap:2203" - volumes: - - /data/honeysap/log:/opt/honeysap/log - # Honeytrap service honeytrap: container_name: honeytrap @@ -245,28 +231,6 @@ services: volumes: - /data/medpot/log/:/var/log/medpot -# Rdpy service - rdpy: - container_name: rdpy - extra_hosts: - - hpfeeds.example.com:127.0.0.1 - restart: always - environment: - - HPFEEDS_SERVER=hpfeeds.example.com - - HPFEEDS_IDENT=user - - HPFEEDS_SECRET=pass - - HPFEEDS_PORT=65000 - - SERVERID=id - networks: - - rdpy_local - ports: - - "3389:3389" - image: "dtagdevsec/rdpy:2203" - read_only: true - volumes: - - /data/rdpy/log:/var/log/rdpy - - ################## #### NSM ################## diff --git a/etc/compose/nextgen.yml b/etc/compose/nextgen.yml index be526628..aefe67e7 100644 --- a/etc/compose/nextgen.yml +++ b/etc/compose/nextgen.yml @@ -17,11 +17,9 @@ networks: endlessh_local: hellpot_local: heralding_local: - honeysap_local: ipphoney_local: mailoney_local: medpot_local: - rdpy_local: redishoneypot_local: ewsposter_local: spiderfoot_local: @@ -306,18 +304,6 @@ services: volumes: - /data/heralding/log:/var/log/heralding -# HoneySAP service - honeysap: - container_name: honeysap - restart: always - networks: - - honeysap_local - ports: - - "3299:3299" - image: "dtagdevsec/honeysap:2203" - volumes: - - /data/honeysap/log:/opt/honeysap/log - # Ipphoney service ipphoney: container_name: ipphoney @@ -363,27 +349,6 @@ services: volumes: - /data/medpot/log/:/var/log/medpot -# Rdpy service - rdpy: - container_name: rdpy - extra_hosts: - - hpfeeds.example.com:127.0.0.1 - restart: always - environment: - - HPFEEDS_SERVER=hpfeeds.example.com - - HPFEEDS_IDENT=user - - HPFEEDS_SECRET=pass - - HPFEEDS_PORT=65000 - - SERVERID=id - networks: - - rdpy_local - ports: - - "3389:3389" - image: "dtagdevsec/rdpy:2203" - read_only: true - volumes: - - /data/rdpy/log:/var/log/rdpy - # Redishoneypot service redishoneypot: container_name: redishoneypot diff --git a/etc/compose/sensor.yml b/etc/compose/sensor.yml index fda5cdbd..44a16d60 100644 --- a/etc/compose/sensor.yml +++ b/etc/compose/sensor.yml @@ -15,10 +15,8 @@ networks: dionaea_local: elasticpot_local: heralding_local: - honeysap_local: mailoney_local: medpot_local: - rdpy_local: tanner_local: ewsposter_local: @@ -273,18 +271,6 @@ services: volumes: - /data/heralding/log:/var/log/heralding -# HoneySAP service - honeysap: - container_name: honeysap - restart: always - networks: - - honeysap_local - ports: - - "3299:3299" - image: "dtagdevsec/honeysap:2203" - volumes: - - /data/honeysap/log:/opt/honeysap/log - # Honeytrap service honeytrap: container_name: honeytrap @@ -333,27 +319,6 @@ services: volumes: - /data/medpot/log/:/var/log/medpot -# Rdpy service - rdpy: - container_name: rdpy - extra_hosts: - - hpfeeds.example.com:127.0.0.1 - restart: always - environment: - - HPFEEDS_SERVER=hpfeeds.example.com - - HPFEEDS_IDENT=user - - HPFEEDS_SECRET=pass - - HPFEEDS_PORT=65000 - - SERVERID=id - networks: - - rdpy_local - ports: - - "3389:3389" - image: "dtagdevsec/rdpy:2203" - read_only: true - volumes: - - /data/rdpy/log:/var/log/rdpy - #### Snare / Tanner ## Tanner Redis Service tanner_redis: diff --git a/etc/compose/standard.yml b/etc/compose/standard.yml index 1aadb6c7..3985ebf3 100644 --- a/etc/compose/standard.yml +++ b/etc/compose/standard.yml @@ -14,10 +14,8 @@ networks: dionaea_local: elasticpot_local: heralding_local: - honeysap_local: mailoney_local: medpot_local: - rdpy_local: tanner_local: ewsposter_local: spiderfoot_local: @@ -273,18 +271,6 @@ services: volumes: - /data/heralding/log:/var/log/heralding -# HoneySAP service - honeysap: - container_name: honeysap - restart: always - networks: - - honeysap_local - ports: - - "3299:3299" - image: "dtagdevsec/honeysap:2203" - volumes: - - /data/honeysap/log:/opt/honeysap/log - # Honeytrap service honeytrap: container_name: honeytrap @@ -333,27 +319,6 @@ services: volumes: - /data/medpot/log/:/var/log/medpot -# Rdpy service - rdpy: - container_name: rdpy - extra_hosts: - - hpfeeds.example.com:127.0.0.1 - restart: always - environment: - - HPFEEDS_SERVER=hpfeeds.example.com - - HPFEEDS_IDENT=user - - HPFEEDS_SECRET=pass - - HPFEEDS_PORT=65000 - - SERVERID=id - networks: - - rdpy_local - ports: - - "3389:3389" - image: "dtagdevsec/rdpy:2203" - read_only: true - volumes: - - /data/rdpy/log:/var/log/rdpy - #### Snare / Tanner ## Tanner Redis Service tanner_redis: diff --git a/iso/installer/install.sh b/iso/installer/install.sh index bb9a0575..a988ab22 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -22,7 +22,7 @@ myLSB_STABLE_SUPPORTED="buster bullseye" myLSB_TESTING_SUPPORTED="stable" myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org https://listbot.sicherheitstacho.eu" myPREINSTALLPACKAGES="aria2 apache2-utils cracklib-runtime curl dialog figlet fuse grc libcrack2 libpq-dev lsb-release net-tools software-properties-common toilet" -myINSTALLPACKAGES="aria2 apache2-utils apparmor apt-transport-https bash-completion bat build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose ethtool fail2ban figlet genisoimage git grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail net-tools neovim npm ntp openssh-server openssl pass pigz prips software-properties-common sshpass syslinux psmisc pv python3-pip toilet unattended-upgrades unzip wget wireless-tools wpasupplicant" +myINSTALLPACKAGES="aria2 apache2-utils apparmor apt-transport-https bash-completion bat build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose ethtool fail2ban figlet genisoimage git grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail net-tools neovim npm ntp openssh-server openssl pass pigz prips software-properties-common sshpass psmisc pv python3-pip toilet unattended-upgrades unzip wget wireless-tools wpasupplicant" myINFO="\ ########################################### ### T-Pot Installer for Debian (Stable) ### diff --git a/makeiso.sh b/makeiso.sh index efa5e064..65dda93a 100755 --- a/makeiso.sh +++ b/makeiso.sh @@ -11,6 +11,7 @@ myBACKTITLE="T-Pot - ISO Creator" ### DEV #myMINIISOLINK="http://ftp.debian.org/debian/dists/buster/main/installer-amd64/current/images/netboot/mini.iso" myMINIISOLINK="http://ftp.debian.org/debian/dists/bullseye/main/installer-amd64/current/images/netboot/mini.iso" +#myMINIISOLINK="http://ftp.debian.org/debian/dists/bullseye/main/installer-arm64/current/images/netboot/mini.iso" myMINIISO="mini.iso" myTPOTISO="tpot.iso" myTPOTDIR="tpotiso" diff --git a/update.sh b/update.sh index 89248e17..00c0347e 100755 --- a/update.sh +++ b/update.sh @@ -184,7 +184,7 @@ function fuUPDATER () { export DEBIAN_FRONTEND=noninteractive echo "### Installing apt-fast" /bin/bash -c "$(curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" -local myPACKAGES="aria2 apache2-utils apparmor apt-transport-https bash-completion bat build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose ethtool fail2ban figlet genisoimage git grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail net-tools neovim npm ntp openssh-server openssl pass pigz prips software-properties-common sshpass syslinux psmisc pv python3-pip toilet unattended-upgrades unzip wget wireless-tools wpasupplicant" +local myPACKAGES="aria2 apache2-utils apparmor apt-transport-https bash-completion bat build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose ethtool fail2ban figlet genisoimage git grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail net-tools neovim npm ntp openssh-server openssl pass pigz prips software-properties-common sshpass psmisc pv python3-pip toilet unattended-upgrades unzip wget wireless-tools wpasupplicant" # Remove purge in the future echo "### Removing repository based install of elasticsearch-curator" apt-get purge elasticsearch-curator -y