telekom-security/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-07-02 01:27:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #583 from dtag-dev-sec/t3chn0m4g3-patch-1

Browse Source 
t3chn0m4g3 patch 1
This commit is contained in:
Marco Ochse
2020-03-15 21:32:35 +01:00
committed by GitHub
parent 313df2f644 cc70144c41
commit 5bbebd6fc4
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
iso/installer/install.sh
View File

@ -11,20 +11,20 @@ myPROGRESSBOXCONF=" --backtitle "$myBACKTITLE" --progressbox 24 80"
mySITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" mySITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org"
myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml" myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml"
myLSB_STABLE_SUPPORTED="stretch buster" myLSB_STABLE_SUPPORTED="stretch buster"
myLSB_TESTING_SUPPORTED="sid" myLSB_TESTING_SUPPORTED="testing"
myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org"
myPREINSTALLPACKAGES="aria2 apache2-utils cracklib-runtime curl dialog figlet fuse grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet" myPREINSTALLPACKAGES="aria2 apache2-utils cracklib-runtime curl dialog figlet fuse grc libcrack2 libpq-dev lsb-release netselect-apt net-tools software-properties-common toilet"
myINSTALLPACKAGES="aria2 apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose elasticsearch-curator ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass pigz prips software-properties-common syslinux psmisc pv python3-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant" myINSTALLPACKAGES="aria2 apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose elasticsearch-curator ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass pigz prips software-properties-common syslinux psmisc pv python3-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant"
myINFO="\ myINFO="\
######################################## ########################################
### T-Pot Installer for Debian (Sid) ### ### T-Pot Installer for Debian (testing) ###
######################################## ########################################
Disclaimer: Disclaimer:
This script will install T-Pot on this system. This script will install T-Pot on this system.
By running the script you know what you are doing: By running the script you know what you are doing:
1. SSH will be reconfigured to tcp/64295. 1. SSH will be reconfigured to tcp/64295.
2. Your Debian installation will be upgraded to Sid / unstable. 2. Your Debian installation will be upgraded to testing.
3. Please ensure other means of access to this system in case something goes wrong. 3. Please ensure other means of access to this system in case something goes wrong.
4. At best this script will be executed on the console instead through a SSH session. 4. At best this script will be executed on the console instead through a SSH session.
@ -283,15 +283,15 @@ function fuGET_DEPS {
echo echo
echo "### Determine fastest mirror for your location." echo "### Determine fastest mirror for your location."
echo echo
netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/ netselect-apt -n -a amd64 testing && cp sources.list /etc/apt/
mySOURCESCHECK=$(cat /etc/apt/sources.list | grep -c unstable) mySOURCESCHECK=$(cat /etc/apt/sources.list | grep -c testing)
if [ "$mySOURCESCHECK" == "0" ] if [ "$mySOURCESCHECK" == "0" ]
then then
echo "### Automatic mirror selection failed, using main mirror." echo "### Automatic mirror selection failed, using main mirror."
# Point to Debian (Sid, unstable) # Point to Debian (testing)
tee /etc/apt/sources.list <<EOF tee /etc/apt/sources.list <<EOF
deb http://deb.debian.org/debian unstable main contrib non-free deb http://deb.debian.org/debian testing main contrib non-free
deb-src http://deb.debian.org/debian unstable main contrib non-free deb-src http://deb.debian.org/debian testing main contrib non-free
EOF EOF
fi fi
echo echo
@ -690,7 +690,7 @@ hash -r
# Cloning T-Pot from GitHub # Cloning T-Pot from GitHub
fuBANNER "Cloning T-Pot" fuBANNER "Cloning T-Pot"
git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot git clone https://github.com/dtag-dev-sec/tpotce -b dev /opt/tpot
# Let's create the T-Pot user # Let's create the T-Pot user
fuBANNER "Create user" fuBANNER "Create user"

2
iso/preseed/tpot.seed
View File

@ -131,7 +131,7 @@ in-target apt-get -y install grub-pc; \
in-target grub-install --force $(debconf-get partman-auto/disk); \ in-target grub-install --force $(debconf-get partman-auto/disk); \
update-dev; \ update-dev; \
in-target update-grub; \ in-target update-grub; \
in-target git clone --depth=1 https://github.com/dtag-dev-sec/tpotce /opt/tpot; \ in-target git clone --depth=1 https://github.com/dtag-dev-sec/tpotce -b dev /opt/tpot; \
in-target sed -i 's/allow-hotplug/auto/g' /etc/network/interfaces; \ in-target sed -i 's/allow-hotplug/auto/g' /etc/network/interfaces; \
#in-target apt-get -y remove exim4-base; \ #in-target apt-get -y remove exim4-base; \
#in-target apt-get -y autoremove; \ #in-target apt-get -y autoremove; \

6
update.sh
View File

@ -63,7 +63,7 @@ function fuSELFUPDATE () {
echo "###### $myBLUE""No updates found in repository.""$myWHITE" echo "###### $myBLUE""No updates found in repository.""$myWHITE"
return return
fi fi
myRESULT=$(git diff --name-only origin/master | grep update.sh) myRESULT=$(git diff --name-only origin/dev | grep update.sh)
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then
echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE" echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"
@ -82,7 +82,7 @@ echo
# Let's check for version # Let's check for version
function fuCHECK_VERSION () { function fuCHECK_VERSION () {
local myMINVERSION="19.03.0" local myMINVERSION="19.03.0"
local myMASTERVERSION="19.03.2" local myMASTERVERSION="19.03.3"
echo echo
echo "### Checking for Release ID" echo "### Checking for Release ID"
myRELEASE=$(lsb_release -i | grep Debian -c) myRELEASE=$(lsb_release -i | grep Debian -c)
@ -183,7 +183,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 aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose elasticsearch-curator ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass pigz prips software-properties-common syslinux psmisc pv python3-elasticsearch-curator python3-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant" local myPACKAGES="aria2 apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit console-setup console-setup-linux cracklib-runtime curl debconf-utils dialog dnsutils docker.io docker-compose elasticsearch-curator ethtool fail2ban figlet genisoimage git glances grc haveged html2text htop iptables iw jq kbd libcrack2 libltdl7 libpam-google-authenticator man mosh multitail netselect-apt net-tools npm ntp openssh-server openssl pass pigz prips software-properties-common syslinux psmisc pv python3-elasticsearch-curator python3-pip toilet unattended-upgrades unzip vim wget wireless-tools wpasupplicant"
echo "### Removing pip based install of elasticsearch-curator" echo "### Removing pip based install of elasticsearch-curator"
pip3 uninstall elasticsearch-curator -y pip3 uninstall elasticsearch-curator -y
hash -r hash -r

2
version
View File

@ -1 +1 @@
19.03.2 19.03.3