diff --git a/cloud/terraform/cloud-init.yaml b/cloud/terraform/cloud-init.yaml index ffac717f..cd0277db 100644 --- a/cloud/terraform/cloud-init.yaml +++ b/cloud/terraform/cloud-init.yaml @@ -6,7 +6,7 @@ packages: runcmd: - curl -sS --retry 5 https://github.com - - git clone -b 22.x https://github.com/telekom-security/tpotce /root/tpot + - git clone https://github.com/telekom-security/tpotce /root/tpot - /root/tpot/iso/installer/install.sh --type=auto --conf=/root/tpot.conf - rm /root/tpot.conf - /sbin/shutdown -r now diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 1d422b0b..8d7ae865 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -704,7 +704,7 @@ if ! [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ]; then fuBANNER "Cloning T-Pot" ### DEV - git clone https://github.com/telekom-security/tpotce -b 22.x /opt/tpot + git clone https://github.com/telekom-security/tpotce /opt/tpot fi # Let's create the T-Pot user diff --git a/iso/preseed/tpot_amd64.seed b/iso/preseed/tpot_amd64.seed index db3e061d..c4437e77 100755 --- a/iso/preseed/tpot_amd64.seed +++ b/iso/preseed/tpot_amd64.seed @@ -133,7 +133,7 @@ update-dev; \ in-target update-grub; \ cp /opt/installer -R /target/root; \ ### DEV -in-target git clone --depth=1 https://github.com/telekom-security/tpotce -b 22.x /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/iso/preseed/tpot_arm64.seed b/iso/preseed/tpot_arm64.seed index a5270899..e286f978 100755 --- a/iso/preseed/tpot_arm64.seed +++ b/iso/preseed/tpot_arm64.seed @@ -92,7 +92,7 @@ d-i debian-installer/splash boolean false d-i preseed/late_command string \ cp /opt/installer -R /target/root; \ ### DEV -in-target git clone --depth=1 https://github.com/telekom-security/tpotce -b 22.x /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 8cb3757e..d14be593 100755 --- a/update.sh +++ b/update.sh @@ -68,7 +68,7 @@ function fuSELFUPDATE () { return fi ### DEV - myRESULT=$(git diff --name-only origin/22.x | 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"