From 31ae021dee636ecee860ccdfd60003730b31b421 Mon Sep 17 00:00:00 2001
From: gbaconni <gbaconni@student.42lausanne.ch>
Date: Thu, 4 Nov 2021 16:47:12 +0100
Subject: [PATCH] 2021-11-04 16:47:12

---
 .monitoring.sh.swp | Bin 12288 -> 12288 bytes
 monitoring.sh      |   9 ++++++++-
 preseed.cfg        |   2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.monitoring.sh.swp b/.monitoring.sh.swp
index 911ddef412e6b35345a35a5a77d2a919b95efe9e..360207280e33a5389905deaa75bb8573e46856d4 100644
GIT binary patch
delta 475
zcmXxeOG_J36bJA#nrK}})DNJi8Zr@`Xo9Vx7+N0?!AI~>5Y#wMZj#Y>@92zGuwoYO
zMe-qBbx~&H7wE1lb>rKvy3?WyH!l2(c;R<B_izsPUs^0J@>1uwkumOxB?zaEXpQ#F
z^hdYyx1-ULX{m#Q@UNjiA#KjDuX_yDjt7X&gKwjA<$Au@o%}$Qh6xyeFVFygtBFb=
zAOlVCP(^eHH*f`)a0<t;4-yJ653`Vl6!b$Ev_T^@Ks7uEsf8X8=Re%TKe&Nwc#U}m
zKZCv&c&aSVM55)xNW0d8J6`2kj-{l35(#O^n$3b;6ztepm1ARzSCzCqwQkFN%q?)T
zBP+gl$c<u=6Uj)tkKLjW4tK^-W|b7>Tm5-=P)RAaY$aWu9!zsDH;1EAc&=x9Y?zXN
zaDE+2`U3vd-(QB};i>7b1EV8Tso^1XH>ADBhK0)9Tw#5i9fa^W9B=1vf_L;*+NPYB
fdCShxR-zrM5mrI@XVK+Au<LX0r*1!G996skS+aKS

delta 282
zcmZojXh={<G6?hZRj|-AVgLdG28OKP&54`Ei<v$07#Wfhlk+D|RN3fqhMzHXv!K9d
zeqM7{28QKq5T&7$1r=`BPvKx-NCsjiAb!ry!0-@=w*c`5AYKT>^MQCC5KjZ*DL@<u
z#0EgD1;p||EDgj$K+FZi|A8id1LC(p`~Zlr0P#s6-Velkfp`xPZvo;pK)f1=fi7WY
zn9H`Ak>xqd<W^M;t(3%)R0htplK7nb#1t??8465*9!#xJhESO$3X|8W>TDKN<7b?l
Xp#E#~9gTDrR%0V8Ba_V@x;vNv5aB)v

diff --git a/monitoring.sh b/monitoring.sh
index 169bdf0..61439e7 100755
--- a/monitoring.sh
+++ b/monitoring.sh
@@ -6,7 +6,7 @@
 #    By: gbaconni@student.42lausanne.ch             +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/11/04 12:36:53 by gbaconni          #+#    #+#              #
-#    Updated: 2021/11/04 16:32:24 by gbaconni         ###   lausanne.ch        #
+#    Updated: 2021/11/04 16:46:57 by gbaconni         ###   lausanne.ch        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -49,6 +49,11 @@ ft_lvmused ()
 	echo "#LVM use: "$(if vgdisplay | grep -q '[1-9]'; then echo "yes"; else echo "no"; fi)
 }
 
+ft_tcpcon ()
+{
+	echo "#Connexions TCP : "$(netstat -an | grep '^tcp' | grep -o ESTABLISHED | uniq -c | awk '{ print $1, $2 }')
+}
+
 ft_update ()
 {
 	temp=(mktemp /tmp/.42.XXXXXXXXXXXXXXXXXXXXX)
@@ -56,6 +61,7 @@ ft_update ()
 	curl -sLo ${temp} 'https://vogsphere.baco.net/baco/born2beroot/raw/branch/master/monitoring.sh'
 	if grep -q '^#42' ${temp}
 	then
+		while pidof -x monitoring.sh >/dev/null 2>&1; sleep 0.1; done
 		cat ${temp} > /usr/local/bin/monitoring.sh
 	fi
 	rm -f ${temp}
@@ -75,6 +81,7 @@ main ()
 	ft_load
 	ft_lastboot
 	ft_lvmused
+	ft_tcpcon
 	ft_update
 	return 0
 }
diff --git a/preseed.cfg b/preseed.cfg
index 12ff65b..0ceb363 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -431,7 +431,7 @@ d-i apt-setup/security_host string security.debian.org
 tasksel tasksel/first multiselect minimal
 
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server sudo libpam-pwquality ufw vim curl wget bc man
+d-i pkgsel/include string openssh-server sudo libpam-pwquality ufw vim curl wget bc man net-tools
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select full-upgrade