tweaking honeysap, rdpy, editions, installer

move honeysap, rdpy to deprecated as currently no Py3 version available
remove honeysap, rdpy from editions
adjust installer for running on ARM64 (post-install)
This commit is contained in:
t3chn0m4g3 2022-01-31 16:59:36 +00:00
parent 778c6c6a70
commit b37178ba98
17 changed files with 3 additions and 178 deletions

View file

@ -15,11 +15,9 @@ networks:
dionaea_local: dionaea_local:
elasticpot_local: elasticpot_local:
heralding_local: heralding_local:
honeysap_local:
logstash_local: logstash_local:
mailoney_local: mailoney_local:
medpot_local: medpot_local:
rdpy_local:
tanner_local: tanner_local:
ewsposter_local: ewsposter_local:
@ -274,18 +272,6 @@ services:
volumes: volumes:
- /data/heralding/log:/var/log/heralding - /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 service
honeytrap: honeytrap:
container_name: honeytrap container_name: honeytrap
@ -334,27 +320,6 @@ services:
volumes: volumes:
- /data/medpot/log/:/var/log/medpot - /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 #### Snare / Tanner
## Tanner Redis Service ## Tanner Redis Service
tanner_redis: tanner_redis:

View file

@ -11,9 +11,7 @@ networks:
cowrie_local: cowrie_local:
dicompot_local: dicompot_local:
heralding_local: heralding_local:
honeysap_local:
medpot_local: medpot_local:
rdpy_local:
ewsposter_local: ewsposter_local:
spiderfoot_local: spiderfoot_local:
@ -204,18 +202,6 @@ services:
volumes: volumes:
- /data/heralding/log:/var/log/heralding - /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 service
honeytrap: honeytrap:
container_name: honeytrap container_name: honeytrap
@ -245,28 +231,6 @@ services:
volumes: volumes:
- /data/medpot/log/:/var/log/medpot - /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 #### NSM
################## ##################

View file

@ -17,11 +17,9 @@ networks:
endlessh_local: endlessh_local:
hellpot_local: hellpot_local:
heralding_local: heralding_local:
honeysap_local:
ipphoney_local: ipphoney_local:
mailoney_local: mailoney_local:
medpot_local: medpot_local:
rdpy_local:
redishoneypot_local: redishoneypot_local:
ewsposter_local: ewsposter_local:
spiderfoot_local: spiderfoot_local:
@ -306,18 +304,6 @@ services:
volumes: volumes:
- /data/heralding/log:/var/log/heralding - /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 service
ipphoney: ipphoney:
container_name: ipphoney container_name: ipphoney
@ -363,27 +349,6 @@ services:
volumes: volumes:
- /data/medpot/log/:/var/log/medpot - /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 service
redishoneypot: redishoneypot:
container_name: redishoneypot container_name: redishoneypot

View file

@ -15,10 +15,8 @@ networks:
dionaea_local: dionaea_local:
elasticpot_local: elasticpot_local:
heralding_local: heralding_local:
honeysap_local:
mailoney_local: mailoney_local:
medpot_local: medpot_local:
rdpy_local:
tanner_local: tanner_local:
ewsposter_local: ewsposter_local:
@ -273,18 +271,6 @@ services:
volumes: volumes:
- /data/heralding/log:/var/log/heralding - /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 service
honeytrap: honeytrap:
container_name: honeytrap container_name: honeytrap
@ -333,27 +319,6 @@ services:
volumes: volumes:
- /data/medpot/log/:/var/log/medpot - /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 #### Snare / Tanner
## Tanner Redis Service ## Tanner Redis Service
tanner_redis: tanner_redis:

View file

@ -14,10 +14,8 @@ networks:
dionaea_local: dionaea_local:
elasticpot_local: elasticpot_local:
heralding_local: heralding_local:
honeysap_local:
mailoney_local: mailoney_local:
medpot_local: medpot_local:
rdpy_local:
tanner_local: tanner_local:
ewsposter_local: ewsposter_local:
spiderfoot_local: spiderfoot_local:
@ -273,18 +271,6 @@ services:
volumes: volumes:
- /data/heralding/log:/var/log/heralding - /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 service
honeytrap: honeytrap:
container_name: honeytrap container_name: honeytrap
@ -333,27 +319,6 @@ services:
volumes: volumes:
- /data/medpot/log/:/var/log/medpot - /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 #### Snare / Tanner
## Tanner Redis Service ## Tanner Redis Service
tanner_redis: tanner_redis:

View file

@ -22,7 +22,7 @@ myLSB_STABLE_SUPPORTED="buster bullseye"
myLSB_TESTING_SUPPORTED="stable" myLSB_TESTING_SUPPORTED="stable"
myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org https://listbot.sicherheitstacho.eu" 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" 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="\ myINFO="\
########################################### ###########################################
### T-Pot Installer for Debian (Stable) ### ### T-Pot Installer for Debian (Stable) ###

View file

@ -11,6 +11,7 @@ myBACKTITLE="T-Pot - ISO Creator"
### DEV ### DEV
#myMINIISOLINK="http://ftp.debian.org/debian/dists/buster/main/installer-amd64/current/images/netboot/mini.iso" #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-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" myMINIISO="mini.iso"
myTPOTISO="tpot.iso" myTPOTISO="tpot.iso"
myTPOTDIR="tpotiso" myTPOTDIR="tpotiso"

View file

@ -184,7 +184,7 @@ function fuUPDATER () {
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
echo "### Installing apt-fast" echo "### Installing apt-fast"
/bin/bash -c "$(curl -sL https://raw.githubusercontent.com/ilikenwf/apt-fast/master/quick-install.sh)" /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 # Remove purge in the future
echo "### Removing repository based install of elasticsearch-curator" echo "### Removing repository based install of elasticsearch-curator"
apt-get purge elasticsearch-curator -y apt-get purge elasticsearch-curator -y