diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..c4267cd4 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +## 20190404 +- **Fix #332** + - If T-Pot, opposed to the requirements, does not have full internet access netselect-apt fails to determine the fastest mirror as it needs ICMP and UDP outgoing. Should netselect-apt fail the default mirrors will be used. +- **Improve install speed with apt-fast** + - Migrating from a stable base install to Debian (Sid) requires downloading lots of packages. Depending on your geo location the download speed was already improved by introducing netselect-apt to determine the fastest mirror. With apt-fast the downloads will be even faster by downloading packages not only in parallel but also with multiple connections per package. diff --git a/README.md b/README.md index 37c5f5a3..4d656d4a 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,11 @@ Furthermore we use the following tools - This feature is beta and is mostly intended to provide you with the latest development advances without the need of reinstalling T-Pot. - **Deprecated tools** - *ctop* will no longer be part of T-Pot. +- **Fix #332** + - If T-Pot, opposed to the requirements, does not have full internet access netselect-apt fails to determine the fastest mirror as it needs ICMP and UDP outgoing. Should netselect-apt fail the default mirrors will be used. +- **Improve install speed with apt-fast** + - Migrating from a stable base install to Debian (Sid) requires downloading lots of packages. Depending on your geo location the download speed was already improved by introducing netselect-apt to determine the fastest mirror. Wit +h apt-fast the downloads will be even faster by downloading packages not only in parallel but also with multiple connections per package. # Technical Concept diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 70db8edd..fdb9a71c 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -665,7 +665,7 @@ pip install elasticsearch-curator yq # Cloning T-Pot from GitHub fuBANNER "Cloning T-Pot" -git clone https://github.com/dtag-dev-sec/tpotce -b fast /opt/tpot +git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot # Let's create the T-Pot user fuBANNER "Create user" diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed index dc9c04a9..32aafd12 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 -b fast /opt/tpot; \ +in-target git clone --depth=1 https://github.com/dtag-dev-sec/tpotce /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; \ diff --git a/update.sh b/update.sh index 54080aa7..e5d68cb7 100755 --- a/update.sh +++ b/update.sh @@ -58,7 +58,7 @@ function fuSELFUPDATE () { echo "###### $myBLUE""No updates found in repository.""$myWHITE" return fi - myRESULT=$(git diff --name-only origin/fast | grep update.sh) + myRESULT=$(git diff --name-only origin/master | grep update.sh) if [ "$myRESULT" == "update.sh" ]; then echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"