diff --git a/bin/updateip.sh b/bin/updateip.sh index a0eecba1..5b5a47ae 100755 --- a/bin/updateip.sh +++ b/bin/updateip.sh @@ -9,10 +9,17 @@ if [ "$myEXTIP" = "" ]; myEXTIP=$myLOCALIP fi mySSHUSER=$(cat /etc/passwd | grep 1000 | cut -d ':' -f1) -sed -i "s#IP:.*#IP: $myLOCALIP ($myEXTIP)#" /etc/issue -sed -i "s#SSH:.*#SSH: ssh -l tsec -p 64295 $myLOCALIP#" /etc/issue -sed -i "s#WEB:.*#WEB: https://$myLOCALIP:64297#" /etc/issue -sed -i "s#ADMIN:.*#ADMIN: https://$myLOCALIP:64294#" /etc/issue +echo "" > /etc/issue +toilet -f ivrit -F metal --filter border:metal "T-Pot 19.03" | sed 's/\\/\\\\/g' >> /etc/issue +echo >> /etc/issue +echo ",---- [ \n ] [ \d ] [ \t ]" >> /etc/issue +echo "|" >> /etc/issue +echo "| IP: $myLOCALIP ($myEXTIP)" >> /etc/issue +echo "| SSH: ssh -l tsec -p 64295 $myLOCALIP" >> /etc/issue +echo "| WEB: https://$myLOCALIP:64297" >> /etc/issue +echo "| ADMIN: https://$myLOCALIP:64294" >> /etc/issue +echo "|" >> /etc/issue +echo "\`----" >> /etc/issue tee /data/ews/conf/ews.ip << EOF [MAIN] ip = $myEXTIP diff --git a/iso/installer/install.sh b/iso/installer/install.sh index 66d8959b..0071cafe 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -127,7 +127,7 @@ fi # Let's check if all dependencies are met 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 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" +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 figlet 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 toilet unattended-upgrades unzip vim wireless-tools wpasupplicant" export DEBIAN_FRONTEND=noninteractive apt-get -y update apt-get -y install libpq-dev software-properties-common diff --git a/iso/preseed/tpot.seed b/iso/preseed/tpot.seed index 7c462772..e9d42ab1 100755 --- a/iso/preseed/tpot.seed +++ b/iso/preseed/tpot.seed @@ -109,7 +109,7 @@ tasksel tasksel/first multiselect ssh-server ######################## ### 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 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 +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 figlet 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 toilet unzip vim wireless-tools wpasupplicant popularity-contest popularity-contest/participate boolean false diff --git a/update.sh b/update.sh index fbcd9584..2ab60c67 100755 --- a/update.sh +++ b/update.sh @@ -168,7 +168,7 @@ echo } 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 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" +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 figlet 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 toilet unattended-upgrades unzip vim wireless-tools wpasupplicant" echo "### Now upgrading packages ..." dpkg --configure -a apt-get -y autoclean