From 67d04f25367bc069e717c7b811c0c6e13eeedcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane?= Date: Thu, 22 Oct 2020 00:13:42 +0200 Subject: Add translate function for all sections + add EN and FR up to date languages files --- db/languages/en | 45 ++++++++++++++++++++++++++++++- db/languages/fr | 59 +++++++++++++++++++++++++++++++++++------ include/binaries | 2 +- include/helper_audit_dockerfile | 10 +++---- include/tests_accounting | 2 +- include/tests_authentication | 2 +- include/tests_banners | 2 +- include/tests_boot_services | 2 +- include/tests_containers | 2 +- include/tests_crypto | 2 +- include/tests_databases | 2 +- include/tests_file_integrity | 2 +- include/tests_file_permissions | 2 +- include/tests_filesystems | 2 +- include/tests_firewalls | 2 +- include/tests_hardening | 2 +- include/tests_homedirs | 2 +- include/tests_insecure_services | 2 +- include/tests_kernel | 2 +- include/tests_kernel_hardening | 2 +- include/tests_ldap | 2 +- include/tests_logging | 2 +- include/tests_mac_frameworks | 2 +- include/tests_mail_messaging | 2 +- include/tests_malware | 2 +- include/tests_nameservices | 2 +- include/tests_networking | 2 +- include/tests_ports_packages | 2 +- include/tests_printers_spoolers | 2 +- include/tests_scheduling | 2 +- include/tests_shells | 2 +- include/tests_snmp | 2 +- include/tests_squid | 2 +- include/tests_ssh | 2 +- include/tests_storage | 2 +- include/tests_system_integrity | 2 +- include/tests_time | 2 +- include/tests_tooling | 2 +- include/tests_usb | 2 +- include/tests_virtualization | 2 +- include/tests_webservers | 2 +- lynis | 4 +-- 42 files changed, 140 insertions(+), 54 deletions(-) diff --git a/db/languages/en b/db/languages/en index 7b697896..7ab20590 100644 --- a/db/languages/en +++ b/db/languages/en @@ -14,12 +14,55 @@ NOTE_EXCEPTIONS_FOUND="Exceptions found" NOTE_EXCEPTIONS_FOUND_DETAILED="Some exceptional events or information was found" NOTE_PLUGINS_TAKE_TIME="Note: plugins have more extensive tests and may take several minutes to complete" NOTE_SKIPPED_TESTS_NON_PRIVILEGED="Skipped tests due to non-privileged mode" +SECTION_ACCOUNTING="Accounting" +SECTION_BANNERS_AND_IDENTIFICATION="Banners and identification" +SECTION_BASICS="Basics" +SECTION_BOOT_AND_SERVICES="Boot and services" +SECTION_CONTAINERS="Containers" +SECTION_CRYPTOGRAPHY="Cryptography" SECTION_CUSTOM_TESTS="Custom tests" SECTION_DATA_UPLOAD="Data upload" +SECTION_DATABASES="Databases" +SECTION_DOWNLOADS="Downloads" +SECTION_EMAIL_AND_MESSAGING="Software: e-mail and messaging" +SECTION_FILE_INTEGRITY="Software: file integrity" +SECTION_FILE_PERMISSIONS="File Permissions" +SECTION_FILE_SYSTEMS="File systems" +SECTION_FIREWALLS="Software: firewalls" +SECTION_GENERAL="General" +SECTION_HARDENING="Hardening" +SECTION_HOME_DIRECTORIES="Home directories" +SECTION_IMAGE="Image" SECTION_INITIALIZING_PROGRAM="Initializing program" -SECTION_MALWARE="Malware" +SECTION_INSECURE_SERVICES="Insecure services" +SECTION_KERNEL="Kernel" +SECTION_KERNEL_HARDENING="Kernel Hardening" +SECTION_LDAP_SERVICES="LDAP Services" +SECTION_LOGGING_AND_FILES="Logging and files" +SECTION_MALWARE="Software: Malware" SECTION_MEMORY_AND_PROCESSES="Memory and Processes" +SECTION_NAME_SERVICES="Name services" +SECTION_NETWORKING="Networking" +SECTION_PERMISSIONS="Permissions" +SECTION_PORTS_AND_PACKAGES="Ports and packages" +SECTION_PRINTERS_AND_SPOOLS="Printers and Spools" +SECTION_PROGRAM_DETAILS="Program Details" +SECTION_SCHEDULED_TASKS="Scheduled tasks" +SECTION_SECURITY_FRAMEWORKS="Security frameworks" +SECTION_SHELLS="Shells" +SECTION_SNMP_SUPPORT="SNMP Support" +SECTION_SOFTWARE="Software" +SECTION_SQUID_SUPPORT="Squid Support" +SECTION_SSH_SUPPORT="SSH Support" +SECTION_STORAGE="Storage" +SECTION_SYSTEM_INTEGRITY="Software: System integrity" +SECTION_SYSTEM_TOOLING="Software: System tooling" SECTION_SYSTEM_TOOLS="System tools" +SECTION_TIME_AND_SYNCHRONIZATION="Time and Synchronization" +SECTION_USB_DEVICES="USB Devices" +SECTION_USERS_GROUPS_AND_AUTHENTICATION="Users, Groups and Authentication" +SECTION_VIRTUALIZATION="Virtualization" +SECTION_WEBSERVER="Software: webserver" STATUS_DISABLED="DISABLED" STATUS_DONE="DONE" STATUS_ENABLED="ENABLED" diff --git a/db/languages/fr b/db/languages/fr index 848dd94e..0a867eee 100644 --- a/db/languages/fr +++ b/db/languages/fr @@ -2,7 +2,7 @@ ERROR_NO_LICENSE="Pas de clé de licence configurée" ERROR_NO_UPLOAD_SERVER="Pas de serveur de transfert configuré" GEN_CHECKING="Vérification" GEN_CURRENT_VERSION="Version actuelle" -GEN_DEBUG_MODE="mode debug" +GEN_DEBUG_MODE="mode débug" GEN_INITIALIZE_PROGRAM="Initialisation" GEN_LATEST_VERSION="Dernière version" GEN_PHASE="phase" @@ -12,34 +12,77 @@ GEN_VERBOSE_MODE="mode verbeux" GEN_WHAT_TO_DO="Que faire" NOTE_EXCEPTIONS_FOUND="Exceptions trouvées" NOTE_EXCEPTIONS_FOUND_DETAILED="Des événements ou informations exceptionnels ont été trouvés" -NOTE_PLUGINS_TAKE_TIME="Note : Les plugins ont des tests plus poussés et peuvent prendre plusieurs minutes" +NOTE_PLUGINS_TAKE_TIME="Note : Les plugins ont des tests plus poussés qui peuvent prendre plusieurs minutes" NOTE_SKIPPED_TESTS_NON_PRIVILEGED="Tests ignorés faute de privilèges" +SECTION_ACCOUNTING="Comptes" +SECTION_BANNERS_AND_IDENTIFICATION="Bannières et identification" +SECTION_BASICS="Basics" +SECTION_BOOT_AND_SERVICES="Démarrage et services" +SECTION_CONTAINERS="Conteneurs" +SECTION_CRYPTOGRAPHY="Cryptographie" SECTION_CUSTOM_TESTS="Tests personnalisés" SECTION_DATA_UPLOAD="Téléchargement de données" +SECTION_DATABASES="Bases de données" +SECTION_DOWNLOADS="Téléchargements" +SECTION_EMAIL_AND_MESSAGING="Logiciel : Email et messagerie" +SECTION_FILE_INTEGRITY="Logiciel : Intégrité de fichier" +SECTION_FILE_PERMISSIONS="Permissions de fichier" +SECTION_FILE_SYSTEMS="Systèmes de fichier" +SECTION_FIREWALLS="Logiciel : Pare-feux" +SECTION_GENERAL="Général" +SECTION_HARDENING="Hardening" +SECTION_HOME_DIRECTORIES="Home directories" +SECTION_IMAGE="Image" SECTION_INITIALIZING_PROGRAM="Initialisation du programme" -SECTION_MALWARE="Malware" +SECTION_INSECURE_SERVICES="Services non sécurisés" +SECTION_KERNEL="Noyau" +SECTION_KERNEL_HARDENING="Kernel Hardening" +SECTION_LDAP_SERVICES="Services LDAP" +SECTION_LOGGING_AND_FILES="Journalisation et fichiers" +SECTION_MALWARE="Logiciel : Malware" SECTION_MEMORY_AND_PROCESSES="Mémoire et processus" +SECTION_NAME_SERVICES="Services de noms" +SECTION_NETWORKING="Mise en réseau" +SECTION_PERMISSIONS="Permissions" +SECTION_PORTS_AND_PACKAGES="Ports et packages" +SECTION_PRINTERS_AND_SPOOLS="Imprimantes et serveurs d'impression" +SECTION_PROGRAM_DETAILS="Détails du programme" +SECTION_SCHEDULED_TASKS="Tâches planifiées" +SECTION_SECURITY_FRAMEWORKS="Security frameworks" +SECTION_SHELLS="Shells" +SECTION_SNMP_SUPPORT="Prise en charge SNMP" +SECTION_SOFTWARE="Logiciel" +SECTION_SQUID_SUPPORT="Prise en charge Squid" +SECTION_SSH_SUPPORT="Prise en charge SSH" +SECTION_STORAGE="Stockage" +SECTION_SYSTEM_INTEGRITY="Logiciel : Intégrité du système" +SECTION_SYSTEM_TOOLING="Logiciel : System tooling" SECTION_SYSTEM_TOOLS="Outils système" +SECTION_TIME_AND_SYNCHRONIZATION="Heure et synchronisation" +SECTION_USB_DEVICES="Périphériques USB" +SECTION_USERS_GROUPS_AND_AUTHENTICATION="Utilisateurs, groupes et authentification" +SECTION_VIRTUALIZATION="Virtualisation" +SECTION_WEBSERVER="Logiciel : Serveur web" STATUS_DISABLED="DÉSACTIVÉ" STATUS_DONE="FAIT" STATUS_ENABLED="ACTIVÉ" STATUS_ERROR="ERREUR" STATUS_FAILED="ÉCHOUÉ" STATUS_FOUND="TROUVÉ" -STATUS_OFF="OFF" -STATUS_OK="OK" -STATUS_ON="ON" STATUS_NO="NON" STATUS_NONE="AUCUN" STATUS_NOT_CONFIGURED="NON CONFIGURÉ" STATUS_NOT_FOUND="NON TROUVÉ" STATUS_NOT_RUNNING="NON LANCÉ" +STATUS_OFF="OFF" +STATUS_OK="OK" +STATUS_ON="ON" STATUS_RUNNING="EN COURS" STATUS_SKIPPED="IGNORÉ" STATUS_SUGGESTION="SUGGESTION" STATUS_UNKNOWN="INCONNU" -STATUS_WARNING="ATTENTION" +STATUS_WARNING="AVERTISSEMENT" STATUS_WEAK="FAIBLE" STATUS_YES="OUI" -TEXT_YOU_CAN_HELP_LOGFILE="Vous pouvez aider en envoyant votre fichier journal" TEXT_UPDATE_AVAILABLE="Mise à jour disponible" +TEXT_YOU_CAN_HELP_LOGFILE="Vous pouvez aider en envoyant votre fichier journal" diff --git a/include/binaries b/include/binaries index ae2c2824..86a4a22f 100644 --- a/include/binaries +++ b/include/binaries @@ -30,7 +30,7 @@ ################################################################################# # if [ ${CHECK_BINARIES} -eq 1 ]; then - InsertSection "System Tools" + InsertSection "${SECTION_SYSTEM_TOOLS}" Display --indent 2 --text "- Scanning available tools..." LogText "Start scanning for available audit binaries and tools..." diff --git a/include/helper_audit_dockerfile b/include/helper_audit_dockerfile index 05d24c24..a71326ee 100644 --- a/include/helper_audit_dockerfile +++ b/include/helper_audit_dockerfile @@ -44,7 +44,7 @@ fi ################################################################################################## # - InsertSection "Image" + InsertSection "${SECTION_IMAGE}" PKGMGR="" FIND=$(grep "^FROM" ${AUDIT_FILE} | sed 's/ /:space:/g') @@ -93,7 +93,7 @@ fi # ################################################################################################## # - InsertSection "Basics" + InsertSection "${SECTION_BASICS}" MAINTAINER=$(grep -E -i "*MAINTAINER" ${AUDIT_FILE} | sed 's/=/ /g' | cut -d'"' -f 2) if [ -z "${MAINTAINER}" ]; then @@ -127,7 +127,7 @@ fi # ################################################################################################## # - InsertSection "Software" + InsertSection "${SECTION_SOFTWARE}" case $PKGMGR in "apt") @@ -166,7 +166,7 @@ fi # ################################################################################################## # - InsertSection "Downloads" + InsertSection "${SECTION_DOWNLOADS}" FILE_DOWNLOAD=0 @@ -217,7 +217,7 @@ fi # ################################################################################################## # - InsertSection "Permissions" + InsertSection "${SECTION_PERMISSIONS}" FIND=$(grep -i "chmod 777" ${AUDIT_FILE}) if HasData "${FIND}"; then diff --git a/include/tests_accounting b/include/tests_accounting index 91fca1a0..ea763789 100644 --- a/include/tests_accounting +++ b/include/tests_accounting @@ -18,7 +18,7 @@ # ################################################################################# # - InsertSection "Accounting" + InsertSection "${SECTION_ACCOUNTING}" # ################################################################################# # diff --git a/include/tests_authentication b/include/tests_authentication index 3dbe08f7..274cd4f4 100644 --- a/include/tests_authentication +++ b/include/tests_authentication @@ -31,7 +31,7 @@ # ################################################################################# # - InsertSection "Users, Groups and Authentication" + InsertSection "${SECTION_USERS_GROUPS_AND_AUTHENTICATION}" # Test : AUTH-9204 # Description : Check users with UID zero (0) diff --git a/include/tests_banners b/include/tests_banners index 60fa3c2e..f7e4d7e9 100644 --- a/include/tests_banners +++ b/include/tests_banners @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Banners and identification" + InsertSection "${SECTION_BANNERS_AND_IDENTIFICATION}" # ################################################################################# # diff --git a/include/tests_boot_services b/include/tests_boot_services index fe5707e4..c86ca52c 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Boot and services" + InsertSection "${SECTION_BOOT_AND_SERVICES}" # ################################################################################# # diff --git a/include/tests_containers b/include/tests_containers index a9a18836..78c12c50 100644 --- a/include/tests_containers +++ b/include/tests_containers @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Containers" + InsertSection "${SECTION_CONTAINERS}" # ################################################################################# # diff --git a/include/tests_crypto b/include/tests_crypto index d4a90cc2..4885fab0 100644 --- a/include/tests_crypto +++ b/include/tests_crypto @@ -26,7 +26,7 @@ # ################################################################################# # - InsertSection "Cryptography" + InsertSection "${SECTION_CRYPTOGRAPHY}" # ################################################################################# # diff --git a/include/tests_databases b/include/tests_databases index ace3fd67..fc44d690 100644 --- a/include/tests_databases +++ b/include/tests_databases @@ -39,7 +39,7 @@ # ################################################################################# # - InsertSection "Databases" + InsertSection "${SECTION_DATABASES}" # Test : DBS-1804 # Description : Check if MySQL is being used diff --git a/include/tests_file_integrity b/include/tests_file_integrity index 728c2616..c06b1703 100644 --- a/include/tests_file_integrity +++ b/include/tests_file_integrity @@ -25,7 +25,7 @@ # ################################################################################# # - InsertSection "Software: file integrity" + InsertSection "${SECTION_FILE_INTEGRITY}" Display --indent 2 --text "- Checking file integrity tools" # ################################################################################# diff --git a/include/tests_file_permissions b/include/tests_file_permissions index e9e859fd..50ccdeee 100644 --- a/include/tests_file_permissions +++ b/include/tests_file_permissions @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "File Permissions" + InsertSection "${SECTION_FILE_PERMISSIONS}" # ################################################################################# # diff --git a/include/tests_filesystems b/include/tests_filesystems index bfe451ab..8dc65acc 100644 --- a/include/tests_filesystems +++ b/include/tests_filesystems @@ -28,7 +28,7 @@ # ################################################################################# # - InsertSection "File systems" + InsertSection "${SECTION_FILE_SYSTEMS}" # ################################################################################# # diff --git a/include/tests_firewalls b/include/tests_firewalls index d3ff1e3d..4d0ba748 100644 --- a/include/tests_firewalls +++ b/include/tests_firewalls @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Software: firewalls" + InsertSection "${SECTION_FIREWALLS}" # ################################################################################# # diff --git a/include/tests_hardening b/include/tests_hardening index 2f88b179..4feff7c6 100644 --- a/include/tests_hardening +++ b/include/tests_hardening @@ -18,7 +18,7 @@ # ################################################################################# # - InsertSection "Hardening" + InsertSection "${SECTION_HARDENING}" # COMPILER_INSTALLED is initialized before HARDEN_COMPILERS_NEEDED=0 diff --git a/include/tests_homedirs b/include/tests_homedirs index 09f4601c..c896bf86 100644 --- a/include/tests_homedirs +++ b/include/tests_homedirs @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Home directories" + InsertSection "${SECTION_HOME_DIRECTORIES}" # ################################################################################# # diff --git a/include/tests_insecure_services b/include/tests_insecure_services index d6d87245..230d117e 100644 --- a/include/tests_insecure_services +++ b/include/tests_insecure_services @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Insecure services" + InsertSection "${SECTION_INSECURE_SERVICES}" # ################################################################################# # diff --git a/include/tests_kernel b/include/tests_kernel index 656048e9..d0f5cdcd 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Kernel" + InsertSection "${SECTION_KERNEL}" # ################################################################################# # diff --git a/include/tests_kernel_hardening b/include/tests_kernel_hardening index 59a5f846..2b45394e 100644 --- a/include/tests_kernel_hardening +++ b/include/tests_kernel_hardening @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Kernel Hardening" + InsertSection "${SECTION_KERNEL_HARDENING}" # ################################################################################# # diff --git a/include/tests_ldap b/include/tests_ldap index 26d11965..7558d491 100644 --- a/include/tests_ldap +++ b/include/tests_ldap @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "LDAP Services" + InsertSection "${SECTION_LDAP_SERVICES}" # ################################################################################# # diff --git a/include/tests_logging b/include/tests_logging index 292940e3..b6110263 100644 --- a/include/tests_logging +++ b/include/tests_logging @@ -36,7 +36,7 @@ # ################################################################################# # - InsertSection "Logging and files" + InsertSection "${SECTION_LOGGING_AND_FILES}" # Test : LOGG-2130 # Description : Check for a running syslog daemon diff --git a/include/tests_mac_frameworks b/include/tests_mac_frameworks index 3f23c77e..5234ab36 100644 --- a/include/tests_mac_frameworks +++ b/include/tests_mac_frameworks @@ -24,7 +24,7 @@ SELINUXFOUND=0 TOMOYOFOUND=0 - InsertSection "Security frameworks" + InsertSection "${SECTION_SECURITY_FRAMEWORKS}" # ################################################################################# # diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging index 3a65765c..cbbde8a0 100644 --- a/include/tests_mail_messaging +++ b/include/tests_mail_messaging @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Software: e-mail and messaging" + InsertSection "${SECTION_EMAIL_AND_MESSAGING}" # ################################################################################# # diff --git a/include/tests_malware b/include/tests_malware index 5e3c6fca..3710be60 100644 --- a/include/tests_malware +++ b/include/tests_malware @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Software: ${SECTION_MALWARE}" + InsertSection "${SECTION_MALWARE}" # ################################################################################# # diff --git a/include/tests_nameservices b/include/tests_nameservices index df41fbc9..46f4f1fb 100644 --- a/include/tests_nameservices +++ b/include/tests_nameservices @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Name services" + InsertSection "${SECTION_NAME_SERVICES}" # ################################################################################# # diff --git a/include/tests_networking b/include/tests_networking index 420f26ea..9657a841 100644 --- a/include/tests_networking +++ b/include/tests_networking @@ -31,7 +31,7 @@ # ################################################################################# # - InsertSection "Networking" + InsertSection "${SECTION_NETWORKING}" # ################################################################################# # diff --git a/include/tests_ports_packages b/include/tests_ports_packages index e1071474..c2978be6 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Ports and packages" + InsertSection "${SECTION_PORTS_AND_PACKAGES}" PACKAGE_MGR_PKG=0 PACKAGE_AUDIT_TOOL="" PACKAGE_AUDIT_TOOL_FOUND=0 diff --git a/include/tests_printers_spoolers b/include/tests_printers_spoolers index b8435493..61304f87 100644 --- a/include/tests_printers_spoolers +++ b/include/tests_printers_spoolers @@ -34,7 +34,7 @@ # ################################################################################# # - InsertSection "Printers and Spools" + InsertSection "${SECTION_PRINTERS_AND_SPOOLS}" # ################################################################################# # diff --git a/include/tests_scheduling b/include/tests_scheduling index a7b3f5c2..b461ba95 100644 --- a/include/tests_scheduling +++ b/include/tests_scheduling @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Scheduled tasks" + InsertSection "${SECTION_SCHEDULED_TASKS}" # ################################################################################# # diff --git a/include/tests_shells b/include/tests_shells index 6f39e1fd..89be9979 100644 --- a/include/tests_shells +++ b/include/tests_shells @@ -23,7 +23,7 @@ ################################################################################# # IDLE_TIMEOUT=0 - InsertSection "Shells" + InsertSection "${SECTION_SHELLS}" # ################################################################################# # diff --git a/include/tests_snmp b/include/tests_snmp index d8ce450d..0bf785f0 100644 --- a/include/tests_snmp +++ b/include/tests_snmp @@ -28,7 +28,7 @@ # ################################################################################# # - InsertSection "SNMP Support" + InsertSection "${SECTION_SNMP_SUPPORT}" # Test : SNMP-3302 # Description : Check for a running SNMP daemon diff --git a/include/tests_squid b/include/tests_squid index f94befa0..d62310a3 100644 --- a/include/tests_squid +++ b/include/tests_squid @@ -29,7 +29,7 @@ # ################################################################################# # - InsertSection "Squid Support" + InsertSection "${SECTION_SQUID_SUPPORT}" # ################################################################################# # diff --git a/include/tests_ssh b/include/tests_ssh index bd02440c..43c678b9 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -34,7 +34,7 @@ # ################################################################################# # - InsertSection "SSH Support" + InsertSection "${SECTION_SSH_SUPPORT}" # ################################################################################# # diff --git a/include/tests_storage b/include/tests_storage index 6de4f15d..89431aa0 100644 --- a/include/tests_storage +++ b/include/tests_storage @@ -18,7 +18,7 @@ # ################################################################################# # - InsertSection "Storage" + InsertSection "${SECTION_STORAGE}" # ################################################################################# # diff --git a/include/tests_system_integrity b/include/tests_system_integrity index 7a21925b..825f3d70 100644 --- a/include/tests_system_integrity +++ b/include/tests_system_integrity @@ -25,7 +25,7 @@ # ################################################################################# # - InsertSection "Software: system integrity" + InsertSection "${SECTION_SYSTEM_INTEGRITY}" Display --indent 2 --text "- Checking file integrity tools" # ################################################################################# diff --git a/include/tests_time b/include/tests_time index 3c5a8477..95c695bc 100644 --- a/include/tests_time +++ b/include/tests_time @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Time and Synchronization" + InsertSection "${SECTION_TIME_AND_SYNCHRONIZATION}" # ################################################################################# # diff --git a/include/tests_tooling b/include/tests_tooling index 7fed8460..26870934 100644 --- a/include/tests_tooling +++ b/include/tests_tooling @@ -37,7 +37,7 @@ # ################################################################################# # - InsertSection "Software: System tooling" + InsertSection "${SECTION_SYSTEM_TOOLING}" # ################################################################################# # diff --git a/include/tests_usb b/include/tests_usb index 1c6cae6d..92c81a32 100644 --- a/include/tests_usb +++ b/include/tests_usb @@ -19,7 +19,7 @@ # ################################################################################# # - InsertSection "USB Devices" + InsertSection "${SECTION_USB_DEVICES}" # ################################################################################# # diff --git a/include/tests_virtualization b/include/tests_virtualization index 3902defc..e4df170e 100644 --- a/include/tests_virtualization +++ b/include/tests_virtualization @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Virtualization" + InsertSection "${SECTION_VIRTUALIZATION}" # ################################################################################# # diff --git a/include/tests_webservers b/include/tests_webservers index 188a6031..45588492 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -22,7 +22,7 @@ # ################################################################################# # - InsertSection "Software: webserver" + InsertSection "${SECTION_WEBSERVER}" # ################################################################################# # diff --git a/lynis b/lynis index 17cd9e91..e7af15da 100755 --- a/lynis +++ b/lynis @@ -862,7 +862,7 @@ ${NORMAL} ################################################################################# # if IsVerbose; then - InsertSection "Program Details" + InsertSection "${SECTION_PROGRAM_DETAILS}" Display --indent 2 --text "- ${GEN_VERBOSE_MODE}" --result "YES" --color GREEN if IsDebug; then Display --indent 2 --text "- ${GEN_DEBUG_MODE}" --result "YES" --color GREEN @@ -1017,7 +1017,7 @@ ${NORMAL} LogText "Exception: skipping test category ${INCLUDE_TEST}, file ${INCLUDE_FILE} has bad permissions (should be 640, 600 or 400)" ReportWarning "NONE" "Invalid permissions on tests file tests_${INCLUDE_TEST}" # Insert a section and warn user also on screen - InsertSection "General" + InsertSection "${SECTION_GENERAL}" Display --indent 2 --text "- Running test category ${INCLUDE_TEST}... " --result "SKIPPED" --color RED fi else -- cgit v1.2.3