From 5badf352be6b92566743befe5c88aef9f2589cf0 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:11:26 +0100 Subject: [PATCH 1/7] deal with changes in sid move to testing cockpit-docker removed upstream, remove here --- iso/installer/install.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/iso/installer/install.sh b/iso/installer/install.sh index ddad6764..32d13d81 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -14,17 +14,17 @@ myLSB_STABLE_SUPPORTED="stretch buster" myLSB_TESTING_SUPPORTED="sid" 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" -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="\ ######################################## -### T-Pot Installer for Debian (Sid) ### +### T-Pot Installer for Debian (testing) ### ######################################## Disclaimer: This script will install T-Pot on this system. By running the script you know what you are doing: 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. 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 "### Determine fastest mirror for your location." echo - netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/ - mySOURCESCHECK=$(cat /etc/apt/sources.list | grep -c unstable) + netselect-apt -n -a amd64 testing && cp sources.list /etc/apt/ + mySOURCESCHECK=$(cat /etc/apt/sources.list | grep -c testing) if [ "$mySOURCESCHECK" == "0" ] then echo "### Automatic mirror selection failed, using main mirror." - # Point to Debian (Sid, unstable) + # Point to Debian (testing) tee /etc/apt/sources.list < Date: Sun, 15 Mar 2020 21:13:07 +0100 Subject: [PATCH 2/7] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 9678a29b..7ecd1371 100755 --- a/update.sh +++ b/update.sh @@ -183,7 +183,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 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" pip3 uninstall elasticsearch-curator -y hash -r From 1452ca4e4c0ade958f8000563ae6bd2c9a57d539 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:24:42 +0100 Subject: [PATCH 3/7] Update install.sh --- iso/installer/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 32d13d81..90aa7e59 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -11,7 +11,7 @@ myPROGRESSBOXCONF=" --backtitle "$myBACKTITLE" --progressbox 24 80" mySITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml" 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" 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 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" @@ -690,7 +690,7 @@ hash -r # Cloning T-Pot from GitHub 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 fuBANNER "Create user" From 4409d9cdacb7fd7743be3728806036fe29531e83 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:25:44 +0100 Subject: [PATCH 4/7] Update tpot.seed --- iso/preseed/tpot.seed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed index 11f8b1a8..c344daf0 100755 --- a/iso/preseed/tpot.seed +++ b/iso/preseed/tpot.seed @@ -131,7 +131,7 @@ in-target apt-get -y install grub-pc; \ in-target grub-install --force $(debconf-get partman-auto/disk); \ update-dev; \ 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 apt-get -y remove exim4-base; \ #in-target apt-get -y autoremove; \ From 6a1f4f9aea75b829e9cd5685827dd3a51290f784 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:27:33 +0100 Subject: [PATCH 5/7] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 7ecd1371..cecdddba 100755 --- a/update.sh +++ b/update.sh @@ -63,7 +63,7 @@ function fuSELFUPDATE () { echo "###### $myBLUE""No updates found in repository.""$myWHITE" return 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" ]; then echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE" From 140a3d22acb8deb6c51234840dfa897623946b59 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:28:46 +0100 Subject: [PATCH 6/7] Update update.sh --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index cecdddba..3f51ab23 100755 --- a/update.sh +++ b/update.sh @@ -82,7 +82,7 @@ echo # Let's check for version function fuCHECK_VERSION () { local myMINVERSION="19.03.0" -local myMASTERVERSION="19.03.2" +local myMASTERVERSION="19.03.3" echo echo "### Checking for Release ID" myRELEASE=$(lsb_release -i | grep Debian -c) From cc70144c41233ec3bf2f970d3977fdc7e77865c4 Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sun, 15 Mar 2020 21:29:10 +0100 Subject: [PATCH 7/7] Update version --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 5298669f..b9d985e2 100644 --- a/version +++ b/version @@ -1 +1 @@ -19.03.2 +19.03.3