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

prepare ghcr for merge

Browse source
This commit is contained in:
t3chn0m4g3 2020-09-04 16:27:05 +00:00
parent 1ee9c29805
commit 38b792a06e
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iso/installer/install.sh
View file

@ -16,7 +16,7 @@ fi
myBACKTITLE="T-Pot-Installer" myBACKTITLE="T-Pot-Installer"
myCONF_FILE="/root/installer/iso.conf" myCONF_FILE="/root/installer/iso.conf"
myPROGRESSBOXCONF=" --backtitle "$myBACKTITLE" --progressbox 24 80" 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" myTPOTCOMPOSE="/opt/tpot/etc/tpot.yml"
myLSB_STABLE_SUPPORTED="stretch buster" myLSB_STABLE_SUPPORTED="stretch buster"
myLSB_TESTING_SUPPORTED="stable" myLSB_TESTING_SUPPORTED="stable"
@ -704,7 +704,7 @@ hash -r
if ! [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ]; if ! [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ];
then then
fuBANNER "Cloning T-Pot" 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 fi
# Let's create the T-Pot user # Let's create the T-Pot user

2
iso/isolinux/txt.cfg
View file

@ -1,6 +1,6 @@
default install default install
label 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 menu default
kernel linux kernel linux
append vga=788 initrd=initrd.gz console-setup/ask_detect=true -- append vga=788 initrd=initrd.gz console-setup/ask_detect=true --

2
iso/preseed/tpot.seed
View file

@ -131,7 +131,7 @@ in-target apt-get -y install grub-pc; \
in-target grub-install --force $(debconf-get partman-auto/disk); \ in-target grub-install --force $(debconf-get partman-auto/disk); \
update-dev; \ update-dev; \
in-target update-grub; \ 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 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

@ -63,7 +63,7 @@ function fuSELFUPDATE () {
echo "###### $myBLUE""No updates found in repository.""$myWHITE" echo "###### $myBLUE""No updates found in repository.""$myWHITE"
return return
fi 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" ]; 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"

2
version
View file

@ -1 +1 @@
20.06.0 20.06.1