diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 2b7c6bb3..a1b91c32 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -16,7 +16,7 @@ fi myBACKTITLE="T-Pot-Installer" myCONF_FILE="/root/installer/iso.conf" myPROGRESSBOXCONF=" --backtitle "$myBACKTITLE" --progressbox 24 80" -mySITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org" +mySITES="https://ghcr.io https://github.com https://pypi.python.org https://debian.org" myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml" myLSB_STABLE_SUPPORTED="stretch buster" myLSB_TESTING_SUPPORTED="stable" @@ -704,7 +704,7 @@ hash -r if ! [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ]; then fuBANNER "Cloning T-Pot" - git clone https://github.com/telekom-security/tpotce -b ghcr /opt/tpot + git clone https://github.com/telekom-security/tpotce /opt/tpot fi # Let's create the T-Pot user diff --git a/iso/isolinux/txt.cfg b/iso/isolinux/txt.cfg index 51df26c2..dd4bb949 100755 --- a/iso/isolinux/txt.cfg +++ b/iso/isolinux/txt.cfg @@ -1,6 +1,6 @@ default install label install - menu label ^T-Pot 20.06.0 (based on Debian Stable) + menu label ^T-Pot 20.06.1 (based on Debian Stable) menu default kernel linux append vga=788 initrd=initrd.gz console-setup/ask_detect=true -- diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed index 2eb9fb5a..4a8262d1 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/telekom-security/tpotce -b ghcr /opt/tpot; \ +in-target git clone --depth=1 https://github.com/telekom-security/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 f4efc728..453af2ea 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/ghcr | 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" diff --git a/version b/version index a30c04d4..8ce48caa 100644 --- a/version +++ b/version @@ -1 +1 @@ -20.06.0 +20.06.1