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

prepare for merge to master

Browse source
This commit is contained in:
t3chn0m4g3 2019-04-01 12:49:07 +00:00
parent da134adbc8
commit 7e9cc240e3
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iso/installer/install.sh
View file

@ -268,11 +268,6 @@ function fuGET_DEPS {
echo "### Determine fastest mirror for your location." echo "### Determine fastest mirror for your location."
echo echo
netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/ netselect-apt -n -a amd64 unstable && cp sources.list /etc/apt/
# # Point to Debian (Sid, unstable)
# tee /etc/apt/sources.list <<EOF
#deb http://deb.debian.org/debian unstable main contrib non-free
#deb-src http://deb.debian.org/debian unstable main contrib non-free
#EOF
echo echo
echo "### Getting update information." echo "### Getting update information."
echo echo
@ -658,7 +653,7 @@ pip install elasticsearch-curator yq
# Cloning T-Pot from GitHub # Cloning T-Pot from GitHub
fuBANNER "Cloning T-Pot" fuBANNER "Cloning T-Pot"
git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot git clone https://github.com/dtag-dev-sec/tpotce /opt/tpot
# Let's create the T-Pot user # Let's create the T-Pot user
fuBANNER "Create user" fuBANNER "Create user"

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/dtag-dev-sec/tpotce -b debian /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 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

@ -58,7 +58,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/debian | 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"