From 0e26d4be48f1044feea6e9f859dc0a387eafaff1 Mon Sep 17 00:00:00 2001
From: Ichbinus <maxime.tertrais@gmail.com>
Date: Thu, 17 Oct 2024 16:30:18 +0200
Subject: [PATCH] corrections installation paquet + applications

---
 Integration_domain/integration_domain.sh      |  2 +-
 .../installations_packages.sh                 | 22 +++++++++++++++++--
 deploiement_main.sh                           | 11 ++--------
 3 files changed, 23 insertions(+), 12 deletions(-)
 rename Packages_métiers/installations_packages => Packages_metiers/installations_packages.sh (80%)

diff --git a/Integration_domain/integration_domain.sh b/Integration_domain/integration_domain.sh
index 094f5fa..33d3847 100644
--- a/Integration_domain/integration_domain.sh
+++ b/Integration_domain/integration_domain.sh
@@ -23,7 +23,7 @@ folder_file="/etc/pam.d/common-session"
 samba_file="/etc/samba/smb.conf"
 sssd_file="/etc/sssd/sssd.conf"
 domain="operis.champlan"
-Allowed_GG=(GRP_ADM_POSTE GRP_ADM_DOM "Tous les sites")
+Allowed_GG=(GRP_ADM_POSTE GRP_ADM_DOM GDL_Orvault GDL_LaRéunion GDL_Grenoble GDL_Champlan GDL_Bordeaux)
 local_admin="operis"
 GG_admin="grp_adm_poste"
 #=======================================================================
diff --git a/Packages_métiers/installations_packages b/Packages_metiers/installations_packages.sh
similarity index 80%
rename from Packages_métiers/installations_packages
rename to Packages_metiers/installations_packages.sh
index 02dc11d..d2b07a6 100644
--- a/Packages_métiers/installations_packages
+++ b/Packages_metiers/installations_packages.sh
@@ -23,12 +23,12 @@ log_erreurs="$folder/err_log.log"
 ##Définition des fonctions
 func_outils_admin_poste(){
 	apt-get update
-    apt install -y net-tools curl Wget htop micro tree gpg gnupg2 
+    apt install -y net-tools curl wget htop micro tree gpg gnupg2 
 }
 
 func_outils_devs(){
 	apt-get update
-    apt install -y git git-extras Gitk Meld jq Yq Fd Ripgrep Parcellite pandoc cloc Fzf Shellcheck dconf-cli Gnome-tweaks gnome-shell-extensions gnome-shell-extension-manager inotify-tools Shutter Sshfs terminator Uuid wl-clipboard Flatpak Apache2 Nginx make build-essential libssl-dev zlib1g-dev libreadline-dev libbz2-dev libsqlite3-dev llvm libncurses5-dev php keepass2 pass
+    apt install -y git git-extras gitk meld jq yq fd-find ripgrep parcellite pandoc cloc fzf shellcheck dconf-cli gnome-tweaks gnome-shell-extensions gnome-shell-extension-manager inotify-tools shutter sshfs terminator uuid wl-clipboard flatpak apache2 nginx make build-essential libssl-dev zlib1g-dev libreadline-dev libbz2-dev libsqlite3-dev llvm libncurses5-dev php keepass2 pass
 }
 
 func_vscode(){
@@ -70,6 +70,14 @@ func_powershell(){
     groupadd docker
     usermod -aG docker $USER
 }
+
+func_virtualbox(){
+	wget -O- -q https://www.virtualbox.org/download/oracle_vbox_2016.asc | sudo gpg --dearmour -o /usr/share/keyrings/oracle_vbox_2016.gpg
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle_vbox_2016.gpg] http://download.virtualbox.org/virtualbox/debian bookworm contrib" | tee /etc/apt/sources.list.d/virtualbox.list
+    apt update
+    apt install -y virtualbox-7.0
+    /sbin/usermod -aG vboxusers $USER
+}
 #=======================================================================
 ##Script
 
@@ -132,4 +140,14 @@ echo "Installation du Container Powershell"
         exit 1
 	fi
     sleep 2
+
+echo "Installation de VirtualBox"
+	if func_powershell 2>> $log_erreurs; then
+		echo "Installation de VirtualBox réussie"
+	else
+		echo "Erreur lors de l'installation de VirtualBox"
+		echo "logs d'erreurs disponibles dans le fichier: $log_erreurs"
+        exit 1
+	fi
+    sleep 2
 }
\ No newline at end of file
diff --git a/deploiement_main.sh b/deploiement_main.sh
index cb52bb5..4498000 100644
--- a/deploiement_main.sh
+++ b/deploiement_main.sh
@@ -25,8 +25,7 @@ source "$folder/Laps_Linux/installation_laps.sh"
 source "$folder/VPN_Forticlient/Installation_vpn.sh"
 source "$folder/Agent_Wazhu/installation_wazhu.sh"
 #source "paramétrage des depots"
-source "$folder/Packages_métiers/installations_packages.sh"
-#source "installation applications (teams,...)"
+source "$folder/Packages_metiers/installations_packages.sh"
 
 func_menu()
 {
@@ -42,7 +41,6 @@ echo "V - Installation vpn"
 echo "W - Installation Wazhu"
 echo "R - Paramétrage des depots"
 echo "P - Installation des paquets métier"
-echo "A - Installation applications (teams,...)"
 echo ""
 echo "Q - quitter"
 read -n 1 -p "votre choix: " choix
@@ -101,14 +99,9 @@ while true ;do
                 ;;
         p|P)
                 echo ""
-                func_Installation des paquets métier
+                func_installations_packages
                 #echo "Installation des paquets métier"
                 ;;
-        a|A)
-                echo ""
-                #func_Installation applications (teams,...)
-                echo "Installation applications (teams,...)"
-                ;;
         q|Q)
                 echo ""
                 exit 1