- ajout de la gestion des locales

TODO.md

@@ -2,8 +2,6 @@ BUG SMTP PROXMOX ? dans les logs
 
 # SCRIPT 
 
-> [DONE]
-
 # SERVER 
 
 ### MAJ Debian 12 > 13 ?
@@ -36,6 +34,9 @@ BUG SMTP PROXMOX ? dans les logs
 >>Server de sauvegarde PROXMOX ?
 
 ### SCRIPT 
+>> Mettre le admin@frogg.fr en proposition par defaut
+> 
+> 
 >> Ajouter la gestion des log
 > 
 >> Ajouter un script de netoyage de maintenance

config/config_install.sh

@@ -34,20 +34,21 @@ CONFIG_DEB_INSTALL_JSON='[
   {"id": "apparmor_pkg", "label": "Installer AppArmor (Paquets)", "type": "pkg", "params": "apparmor"},
   {"id": "fail2ban_pkg", "label": "Installer Fail2Ban", "type": "pkg", "params": "fail2ban"},
   {"id": "ufw_pkg", "label": "Installer Firewall (UFW)", "type": "pkg", "params": "ufw"},
+  {"id": "locale_install", "label": "Installer les locales En & Fr", "type": "sys", "params": "locale_install"},
   {"id": "script_update", "label": "Installer script de mise à jour automatique", "type": "sys", "params": "script_update"},
   {"id": "cert_install", "label": "Installer le certificat wildcard auto", "type": "sys", "params": "cert_install"},
   {"id": "ipv6", "label": "Désactiver IPv6", "type": "sys", "params": "ipv6"},
   {"id": "motd", "label": "Désactiver les messages MOTD", "type": "sys", "params": "motd"},
   {"id": "mail", "label": "Configurer ADMIN_MAIL", "type": "sys", "params": "mail"},
-  {"id": "gen_ssh_key", "label": "Creer une clé RSA pour SSH", "type": "sys", "params": "gen_ssh_key"},
+  {"id": "hostname", "label": "Configurer le Hostname", "type": "sys", "params": "hostname"},
-  {"id": "hostname", "label": "Changer le Hostname", "type": "sys", "params": "hostname"},
   {"id": "static_ip", "label": "Configurer IP Statique (eth0)", "type": "sys", "params": "static_ip"},
-  {"id": "deploy_ssh_key", "label": "Autoriser la clé RSA sur un hôte distant", "type": "sys", "params": "deploy_ssh_key"},
-  {"id": "clone_ssh_key", "label": "Cloner la clé RSA sur un hôte distant", "type": "sys", "params": "clone_ssh_key"},
   {"id": "msmtp", "label": "Configurer MSMTP (Relais Mail)", "type": "sys", "params": "msmtp"},
   {"id": "apparmor", "label": "Configurer AppArmor (Kernel)", "type": "sys", "params": "apparmor"},
   {"id": "fail2ban", "label": "Configurer Fail2Ban", "type": "sys", "params": "fail2ban"},
   {"id": "ufw", "label": "Configurer Firewall (UFW)", "type": "sys", "params": "ufw"},
   {"id": "zabbix_conf", "label": "Configurer le client ZABBIX", "type": "sys", "params": "zabbix_conf"},
-  {"id": "ntp", "label": "Configurer Heure Française", "type": "sys", "params": "ntp"}
+  {"id": "ntp", "label": "Configurer Heure Française", "type": "sys", "params": "ntp"},
+  {"id": "gen_ssh_key", "label": "Creer une clé RSA pour SSH", "type": "sys", "params": "gen_ssh_key"},
+  {"id": "clone_ssh_key", "label": "Cloner la clé RSA sur un hôte distant", "type": "sys", "params": "clone_ssh_key"},
+  {"id": "deploy_ssh_key", "label": "Autoriser la clé RSA sur un hôte distant", "type": "sys", "params": "deploy_ssh_key"}
 ]'

func/deb_sys.sh

@@ -50,6 +50,16 @@ check_deb_sys_ipv6(){
   fi
 }
 
+
+check_deb_sys_locale_install() {
+  # On cherche spécifiquement les lignes décommentées pour fr_FR ET en_US
+  if grep -q "^fr_FR.UTF-8" /etc/locale.gen && grep -q "^en_US.UTF-8" /etc/locale.gen; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 check_deb_sys_zabbix(){
   if dpkg -s zabbix-agent2 >/dev/null 2>&1; then
     return 0
@@ -144,8 +154,7 @@ check_deb_sys_clone_ssh_key(){
 check_deb_sys_cert_install(){
   local marker="# $CONFIG_DEB_INSTALL_DEFAULT_CA_CRON"
   if crontab -l 2>/dev/null | grep -q "$marker"; then
-      #return 0
+      return 0
-      return 1
   else
     return 1
   fi
@@ -154,8 +163,7 @@ check_deb_sys_cert_install(){
 check_deb_sys_script_update(){
   local marker="# $CONFIG_DEB_INSTALL_CRON_UPDATE"
   if crontab -l 2>/dev/null | grep -q "$marker"; then
-      #return 0
+      return 0
-      return 1
   else
     return 1
   fi
@@ -177,6 +185,18 @@ do_deb_sys_script_update(){
   update_cron_marker "$CONFIG_DEB_INSTALL_CRON_UPDATE" "0 3 * * * $full_command"
 }
 
+do_deb_sys_locale_install(){
+  msg_info "installation du package si besoin"
+  apt install locales
+  msg_info "activation des locales Fr et En"
+  sed -i '/fr_FR.UTF-8/s/^# //' /etc/locale.gen
+  sed -i '/en_US.UTF-8/s/^# //' /etc/locale.gen
+  msg_info "génération des locales Fr et En"
+  locale-gen en_US.UTF-8
+  locale-gen fr_FR.UTF-8
+  msg_success "opération terminée"
+}
+
 do_deb_sys_motd(){
   $SUDO chmod -x /etc/update-motd.d/*
   msg_success "Les fichiers dans /etc/update-motd.d/ ne sont plus executable"