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

tweaking

Browse source
This commit is contained in:
techn0m4g3 2019-01-30 11:44:17 +01:00
parent ddbb9cd02c
commit 0f9df3f388
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
iso/installer/install.sh
View file

@ -126,7 +126,7 @@ fi
# Let's check if all dependencies are met # Let's check if all dependencies are met
function fuGET_DEPS { function fuGET_DEPS {
local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant" local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc haveged html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant"
apt-get -y update apt-get -y update
apt-get -y install software-properties-common apt-get -y install software-properties-common
add-apt-repository "deb http://ftp.debian.org/debian testing main contrib non-free" add-apt-repository "deb http://ftp.debian.org/debian testing main contrib non-free"
@ -145,6 +145,9 @@ echo
echo "### Installing T-Pot dependencies." echo "### Installing T-Pot dependencies."
echo echo
apt-get -y install $myPACKAGES apt-get -y install $myPACKAGES
# Remove exim4
apt-get -y purge exim4-base
apt-get -y autoremove
} }
# Let's load dialog color theme # Let's load dialog color theme
@ -234,7 +237,7 @@ fuRANDOMWORD () {
if [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ]; if [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ];
then then
sleep 5 sleep 5
tput civis #tput civis
dialog --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Wait to avoid interference with service messages ]" --pause "" 6 80 7 dialog --no-ok --no-cancel --backtitle "$myBACKTITLE" --title "[ Wait to avoid interference with service messages ]" --pause "" 6 80 7
fi fi
@ -316,7 +319,7 @@ if [ "$myTPOT_DEPLOYMENT_TYPE" == "iso" ] || [ "$myTPOT_DEPLOYMENT_TYPE" == "use
done; done;
fi fi
# Let's put cursor back in standard form # Let's put cursor back in standard form
tput cnorm #tput cnorm
#################### ####################
# User interaction # # User interaction #
@ -440,7 +443,7 @@ fi
######################## ########################
# Put cursor in invisible mode # Put cursor in invisible mode
tput civis #tput civis
# Let's generate a SSL self-signed certificate without interaction (browsers will see it invalid anyway) # Let's generate a SSL self-signed certificate without interaction (browsers will see it invalid anyway)
if ! [ "$myCONF_TPOT_FLAVOR" == "SENSOR" ]; if ! [ "$myCONF_TPOT_FLAVOR" == "SENSOR" ];

12
iso/preseed/tpot.seed
View file

@ -25,8 +25,8 @@ d-i console-setup/detected note
######################### #########################
### Network Configuration ### Network Configuration
######################### #########################
#d-i netcfg/choose_interface select auto d-i netcfg/choose_interface select auto
#d-i netcfg/dhcp_timeout string 60 d-i netcfg/dhcp_timeout string 60
d-i netcfg/get_hostname string t-pot d-i netcfg/get_hostname string t-pot
d-i netcfg/get_domain string d-i netcfg/get_domain string
@ -81,8 +81,6 @@ d-i mirror/http/proxy string
d-i mirror/suite string testing d-i mirror/suite string testing
#d-i mirror/udeb/suite string testing #d-i mirror/udeb/suite string testing
######
########################### ###########################
### Skip Grub Configuration ### Skip Grub Configuration
########################### ###########################
@ -105,12 +103,12 @@ d-i clock-setup/ntp-server string debian.pool.ntp.org
################## ##################
### Package Groups ### Package Groups
################## ##################
tasksel tasksel/first multiselect standard, ssh-server tasksel tasksel/first multiselect ssh-server
######################## ########################
### Package Installation ### Package Installation
######################## ########################
d-i pkgsel/include string apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unzip vim wireless-tools wpasupplicant d-i pkgsel/include string apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc haveged html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unzip vim wireless-tools wpasupplicant
popularity-contest popularity-contest/participate boolean false popularity-contest popularity-contest/participate boolean false
@ -133,6 +131,8 @@ d-i preseed/late_command string \
#in-target grub-install --force $(debconf-get partman-auto/disk); \ #in-target grub-install --force $(debconf-get partman-auto/disk); \
#in-target update-grub; \ #in-target update-grub; \
in-target git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot; \ in-target git clone https://github.com/dtag-dev-sec/tpotce -b debian /opt/tpot; \
in-target apt-get -y remove exim4-base; \
in-target apt-get -y autoremove; \
cp /target/opt/tpot/iso/installer/rc.local.install /target/etc/rc.local; \ cp /target/opt/tpot/iso/installer/rc.local.install /target/etc/rc.local; \
cp /target/opt/tpot/iso/installer -R /target/root/; cp /target/opt/tpot/iso/installer -R /target/root/;

2
update.sh
View file

@ -168,7 +168,7 @@ echo
} }
function fuUPDATER () { function fuUPDATER () {
local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc html2text htop ifupdown iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant" local myPACKAGES="apache2-utils apparmor apt-transport-https aufs-tools bash-completion build-essential ca-certificates cgroupfs-mount cockpit cockpit-docker curl debconf-utils dialog dnsutils docker.io docker-compose dstat ethtool fail2ban genisoimage git glances grc haveged html2text htop iptables iw jq libcrack2 libltdl7 lm-sensors man mosh multitail net-tools npm ntp openssh-server openssl pass prips software-properties-common syslinux psmisc pv python-pip unattended-upgrades unzip vim wireless-tools wpasupplicant"
echo "### Now upgrading packages ..." echo "### Now upgrading packages ..."
dpkg --configure -a dpkg --configure -a
apt-get -y autoclean apt-get -y autoclean