Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-07-02 04:52:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

keep # DEV tags, point 22.04.0 to master, prep PR

Browse source
This commit is contained in:
t3chn0m4g3 2022-04-11 14:37:04 +00:00
parent f52f1a8f4f
commit 020500d333
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/terraform/cloud-init.yaml
View file

@ -6,7 +6,7 @@ packages:
runcmd: runcmd:
- curl -sS --retry 5 https://github.com - 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 - /root/tpot/iso/installer/install.sh --type=auto --conf=/root/tpot.conf
- rm /root/tpot.conf - rm /root/tpot.conf
- /sbin/shutdown -r now - /sbin/shutdown -r now

2
iso/installer/install.sh
View file

@ -704,7 +704,7 @@ if ! [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ];
then then
fuBANNER "Cloning T-Pot" fuBANNER "Cloning T-Pot"
### DEV ### 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 fi
# Let's create the T-Pot user # Let's create the T-Pot user

2
iso/preseed/tpot_amd64.seed
View file

@ -133,7 +133,7 @@ update-dev; \
in-target update-grub; \ in-target update-grub; \
cp /opt/installer -R /target/root; \ cp /opt/installer -R /target/root; \
### DEV ### 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 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; \

2
iso/preseed/tpot_arm64.seed
View file

@ -92,7 +92,7 @@ d-i debian-installer/splash boolean false
d-i preseed/late_command string \ d-i preseed/late_command string \
cp /opt/installer -R /target/root; \ cp /opt/installer -R /target/root; \
### DEV ### 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 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; \

2
update.sh
View file

@ -68,7 +68,7 @@ function fuSELFUPDATE () {
return return
fi fi
### DEV ### 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" ]; 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"