From bda4cb18a65526b246ae170de38749950c169024 Mon Sep 17 00:00:00 2001 From: sorcier Date: Wed, 4 Nov 2026 11:06:04 +0100 Subject: [PATCH] fix(voicemail): automate modules.conf and voicemail includes in install.sh and fix.sh (v1.4.6) --- install.sh | 35 +++++++++++++++++++++++++---- public/api.php | 2 +- public/index.php | 2 +- scripts/fix.sh | 36 ++++++++++++++++++++++++++++-- scripts/update.sh | 12 ++++++++-- src/SystemChecker.php | 52 +++++++++++++++++++++++++++++++++++++------ version.json | 11 ++++----- 7 files changed, 128 insertions(+), 22 deletions(-) diff --git a/install.sh b/install.sh index 892a4a9..675be57 100755 --- a/install.sh +++ b/install.sh @@ -287,23 +287,50 @@ touch /etc/asterisk/pjsip.conf \ /etc/asterisk/pjsip.custom.conf \ /etc/asterisk/extensions.conf \ /etc/asterisk/extensions.custom.conf \ + /etc/asterisk/musiconhold.conf \ /etc/asterisk/musiconhold.custom.conf \ + /etc/asterisk/voicemail.conf \ /etc/asterisk/voicemail.custom.conf \ + /etc/asterisk/modules.conf \ /etc/asterisk/rtp.conf \ /etc/asterisk/features.conf +# 1. Modules Asterisk : Désactivation des modules ODBC/IMAP incompatibles sur Debian (évite conflit bloquant app_voicemail) +if ! grep -q 'noload => app_voicemail_odbc.so' /etc/asterisk/modules.conf 2>/dev/null; then + if grep -q '\[modules\]' /etc/asterisk/modules.conf 2>/dev/null; then + sed -i '/\[modules\]/a noload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so' /etc/asterisk/modules.conf 2>/dev/null || true + else + printf '[modules]\nautoload=yes\nnoload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so\n' >> /etc/asterisk/modules.conf + fi +fi + +# 2. Inclusions des fichiers custom dans les configurations principales if ! grep -q 'pjsip.custom.conf' /etc/asterisk/pjsip.conf 2>/dev/null; then printf '\n#tryinclude "pjsip.custom.conf"\n' >> /etc/asterisk/pjsip.conf fi if ! grep -q 'extensions.custom.conf' /etc/asterisk/extensions.conf 2>/dev/null; then printf '\n#tryinclude "extensions.custom.conf"\n' >> /etc/asterisk/extensions.conf fi -chown -R asterisk:asterisk /etc/asterisk +if ! grep -q 'musiconhold.custom.conf' /etc/asterisk/musiconhold.conf 2>/dev/null; then + sed -i 's/^\[default\]/;[default]/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + sed -i 's/^mode=files/;mode=files/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + sed -i 's/^directory=moh/;directory=moh/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + printf '\n#tryinclude "/etc/asterisk/musiconhold.custom.conf"\n' >> /etc/asterisk/musiconhold.conf +fi +if ! grep -q 'voicemail.custom.conf' /etc/asterisk/voicemail.conf 2>/dev/null; then + sed -i 's/^1234 => 4242/;1234 => 4242/' /etc/asterisk/voicemail.conf 2>/dev/null || true + sed -i 's/^;\s*passwordlocation\s*=\s*spooldir/passwordlocation=spooldir/' /etc/asterisk/voicemail.conf 2>/dev/null || true + sed -i 's|^;\s*externpassnotify\s*=.*|externpassnotify=/usr/bin/php /var/www/nexus-pbx/scripts/voicemail_pass_sync.php|' /etc/asterisk/voicemail.conf 2>/dev/null || true + printf '\n#tryinclude "voicemail.custom.conf"\n' >> /etc/asterisk/voicemail.conf +fi + +mkdir -p /var/spool/asterisk/voicemail/default /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh +chown -R asterisk:asterisk /etc/asterisk /var/spool/asterisk /var/lib/asterisk chmod 0664 /etc/asterisk/*.conf /etc/asterisk/*.custom.conf 2>/dev/null || true chmod 2750 /etc/asterisk/keys -chmod 2775 /etc/asterisk -setfacl -R -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk 2>/dev/null || true -setfacl -R -d -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk 2>/dev/null || true +chmod 2775 /etc/asterisk /var/spool/asterisk /var/spool/asterisk/voicemail /var/lib/asterisk/sounds /var/lib/asterisk/moh +setfacl -R -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/spool/asterisk /var/lib/asterisk 2>/dev/null || true +setfacl -R -d -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/spool/asterisk /var/lib/asterisk 2>/dev/null || true # Rechargement Asterisk immédiat pour appliquer AMI et Logger asterisk -rx "core reload" 2>/dev/null || true diff --git a/public/api.php b/public/api.php index 20f5e03..d00703a 100644 --- a/public/api.php +++ b/public/api.php @@ -140,7 +140,7 @@ try { $installedVerData = file_exists("{$appDir}/version.json") ? json_decode((string)file_get_contents("{$appDir}/version.json"), true) : []; - $installedVer = $installedVerData['version'] ?? '1.4.5'; + $installedVer = $installedVerData['version'] ?? '1.4.6'; echo json_encode([ 'success' => true, diff --git a/public/index.php b/public/index.php index 863d3c5..bc1a690 100644 --- a/public/index.php +++ b/public/index.php @@ -18,7 +18,7 @@ $companyLogo = trim($branding['company_logo'] ?? ''); $hasBranding = !empty($companyName) || !empty($companyLogo); $appVerData = file_exists(__DIR__ . '/../version.json') ? json_decode((string)file_get_contents(__DIR__ . '/../version.json'), true) : []; -$appVersion = $appVerData['version'] ?? '1.4.5'; +$appVersion = $appVerData['version'] ?? '1.4.6'; ?> diff --git a/scripts/fix.sh b/scripts/fix.sh index fc943ce..08a2799 100755 --- a/scripts/fix.sh +++ b/scripts/fix.sh @@ -65,15 +65,47 @@ touch /etc/asterisk/pjsip.conf \ /etc/asterisk/pjsip.custom.conf \ /etc/asterisk/extensions.conf \ /etc/asterisk/extensions.custom.conf \ + /etc/asterisk/musiconhold.conf \ /etc/asterisk/musiconhold.custom.conf \ + /etc/asterisk/voicemail.conf \ /etc/asterisk/voicemail.custom.conf \ + /etc/asterisk/modules.conf \ /etc/asterisk/rtp.conf \ /etc/asterisk/features.conf 2>/dev/null || true -mkdir -p /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh /var/spool/asterisk/voicemail 2>/dev/null || true +# Désactivation des modules ODBC/IMAP incompatibles sur Debian (évite conflit bloquant app_voicemail) +if ! grep -q 'noload => app_voicemail_odbc.so' /etc/asterisk/modules.conf 2>/dev/null; then + if grep -q '\[modules\]' /etc/asterisk/modules.conf 2>/dev/null; then + sed -i '/\[modules\]/a noload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so' /etc/asterisk/modules.conf 2>/dev/null || true + else + printf '[modules]\nautoload=yes\nnoload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so\n' >> /etc/asterisk/modules.conf + fi +fi + +# Inclusions Asterisk et configuration messagerie vocale +if ! grep -q 'pjsip.custom.conf' /etc/asterisk/pjsip.conf 2>/dev/null; then + printf '\n#tryinclude "pjsip.custom.conf"\n' >> /etc/asterisk/pjsip.conf +fi +if ! grep -q 'extensions.custom.conf' /etc/asterisk/extensions.conf 2>/dev/null; then + printf '\n#tryinclude "extensions.custom.conf"\n' >> /etc/asterisk/extensions.conf +fi +if ! grep -q 'musiconhold.custom.conf' /etc/asterisk/musiconhold.conf 2>/dev/null; then + sed -i 's/^\[default\]/;[default]/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + sed -i 's/^mode=files/;mode=files/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + sed -i 's/^directory=moh/;directory=moh/' /etc/asterisk/musiconhold.conf 2>/dev/null || true + printf '\n#tryinclude "/etc/asterisk/musiconhold.custom.conf"\n' >> /etc/asterisk/musiconhold.conf +fi +if ! grep -q 'voicemail.custom.conf' /etc/asterisk/voicemail.conf 2>/dev/null; then + sed -i 's/^1234 => 4242/;1234 => 4242/' /etc/asterisk/voicemail.conf 2>/dev/null || true + sed -i 's/^;\s*passwordlocation\s*=\s*spooldir/passwordlocation=spooldir/' /etc/asterisk/voicemail.conf 2>/dev/null || true + sed -i 's|^;\s*externpassnotify\s*=.*|externpassnotify=/usr/bin/php /var/www/nexus-pbx/scripts/voicemail_pass_sync.php|' /etc/asterisk/voicemail.conf 2>/dev/null || true + printf '\n#tryinclude "voicemail.custom.conf"\n' >> /etc/asterisk/voicemail.conf +fi + +mkdir -p /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh /var/spool/asterisk/voicemail/default 2>/dev/null || true chown -R asterisk:asterisk /etc/asterisk /var/lib/asterisk /var/spool/asterisk /var/log/asterisk 2>/dev/null || true chmod -R 775 /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh /var/spool/asterisk 2>/dev/null || true -chmod 2775 /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh /var/spool/asterisk 2>/dev/null || true +chmod 2775 /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh /var/spool/asterisk /var/spool/asterisk/voicemail 2>/dev/null || true chmod 2750 /etc/asterisk/keys 2>/dev/null || true chmod 0664 /etc/asterisk/*.conf /etc/asterisk/*.custom.conf 2>/dev/null || true diff --git a/scripts/update.sh b/scripts/update.sh index aacacce..302df57 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -130,8 +130,16 @@ $gen->writeAllConfigs(); # 5. Fix permissions & ACLs echo -e "${C_GRAY}[5/6] Application des permissions et ACLs système...${C_RESET}" -setfacl -R -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh 2>/dev/null || true -setfacl -R -d -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh 2>/dev/null || true +php -r ' +require_once "/var/www/nexus-pbx/src/Database.php"; +require_once "/var/www/nexus-pbx/src/SystemChecker.php"; +App\SystemChecker::ensureAsteriskIncludes(); +' 2>/dev/null || true +mkdir -p /var/spool/asterisk/voicemail/default /var/lib/asterisk/sounds/custom /var/lib/asterisk/moh 2>/dev/null || true +chown -R asterisk:asterisk /var/spool/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh 2>/dev/null || true +chmod 2775 /var/spool/asterisk /var/spool/asterisk/voicemail /var/lib/asterisk/sounds /var/lib/asterisk/moh 2>/dev/null || true +setfacl -R -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh /var/spool/asterisk 2>/dev/null || true +setfacl -R -d -m u:www-data:rwx,g:asterisk:rwx /etc/asterisk /var/lib/asterisk/sounds /var/lib/asterisk/moh /var/spool/asterisk 2>/dev/null || true chmod 0664 /etc/asterisk/*.conf /etc/asterisk/*.custom.conf 2>/dev/null || true # 6. Rechargement des services diff --git a/src/SystemChecker.php b/src/SystemChecker.php index dd58293..ea7601d 100644 --- a/src/SystemChecker.php +++ b/src/SystemChecker.php @@ -70,17 +70,22 @@ class SystemChecker : 'Accès refusé en écriture dans /etc/asterisk pour PHP-FPM', ]; - // 5. Directives #tryinclude dans pjsip.conf et extensions.conf + // 5. Directives #tryinclude dans pjsip.conf, extensions.conf, voicemail.conf et modules.conf $pjsipMain = @file_get_contents('/etc/asterisk/pjsip.conf') ?: ''; $extMain = @file_get_contents('/etc/asterisk/extensions.conf') ?: ''; - $incOk = str_contains($pjsipMain, 'pjsip.custom.conf') && str_contains($extMain, 'extensions.custom.conf'); + $vmMain = @file_get_contents('/etc/asterisk/voicemail.conf') ?: ''; + $modMain = @file_get_contents('/etc/asterisk/modules.conf') ?: ''; + $incOk = str_contains($pjsipMain, 'pjsip.custom.conf') + && str_contains($extMain, 'extensions.custom.conf') + && str_contains($vmMain, 'voicemail.custom.conf') + && str_contains($modMain, 'app_voicemail_odbc.so'); $checks[] = [ 'id' => 'asterisk_includes', - 'label' => 'Inclusions natives (#tryinclude *.custom.conf)', + 'label' => 'Inclusions Asterisk & Voicemail (#tryinclude & modules.conf)', 'ok' => $incOk, 'detail' => $incOk - ? 'pjsip.conf et extensions.conf incluent bien les fichiers .custom.conf' - : 'Directive #tryinclude manquante dans pjsip.conf ou extensions.conf', + ? 'pjsip.conf, extensions.conf, voicemail.conf et modules.conf configurés' + : 'Directive #tryinclude manquante ou conflit modules.conf détecté', ]; // 6. Certificats TLS (Let's Encrypt ou Certificat local Debian) @@ -142,6 +147,25 @@ class SystemChecker public static function ensureAsteriskIncludes(): void { + // 1. modules.conf: Désactiver les modules voicemail ODBC/IMAP incompatibles sur Debian (évite collision bloquante avec app_voicemail.so) + $modConf = '/etc/asterisk/modules.conf'; + if (is_file($modConf) && is_writable($modConf)) { + $content = (string)file_get_contents($modConf); + $changed = false; + if (!str_contains($content, 'app_voicemail_odbc.so')) { + if (preg_match('/\[modules\]/i', $content)) { + $content = preg_replace('/\[modules\]/i', "[modules]\nnoload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so", $content, 1); + $changed = true; + } else { + $content = "[modules]\nautoload=yes\nnoload => app_voicemail_odbc.so\nnoload => app_voicemail_imap.so\n\n" . $content; + $changed = true; + } + } + if ($changed) { + file_put_contents($modConf, $content); + } + } + $pjsipConf = '/etc/asterisk/pjsip.conf'; if (is_file($pjsipConf) && is_writable($pjsipConf)) { $content = (string)file_get_contents($pjsipConf); @@ -177,8 +201,20 @@ class SystemChecker if (is_file($vmConf) && is_writable($vmConf)) { $content = (string)file_get_contents($vmConf); $cleaned = preg_replace('/^1234 => 4242.*/m', ';1234 => 4242,Example Mailbox,root@localhost', $content); - $cleaned = preg_replace('/^;\s*passwordlocation\s*=\s*spooldir/m', 'passwordlocation=spooldir', $cleaned); - $cleaned = preg_replace('/^;\s*externpassnotify\s*=.*/m', 'externpassnotify=/usr/bin/php /var/www/nexus-pbx/scripts/voicemail_pass_sync.php', $cleaned); + if (preg_match('/^;\s*passwordlocation\s*=\s*spooldir/m', $cleaned)) { + $cleaned = preg_replace('/^;\s*passwordlocation\s*=\s*spooldir/m', 'passwordlocation=spooldir', $cleaned); + } elseif (!str_contains($cleaned, 'passwordlocation=spooldir') && !str_contains($cleaned, 'passwordlocation = spooldir')) { + if (preg_match('/\[general\]/i', $cleaned)) { + $cleaned = preg_replace('/\[general\]/i', "[general]\npasswordlocation=spooldir", $cleaned, 1); + } + } + if (preg_match('/^;\s*externpassnotify\s*=.*/m', $cleaned)) { + $cleaned = preg_replace('/^;\s*externpassnotify\s*=.*/m', 'externpassnotify=/usr/bin/php /var/www/nexus-pbx/scripts/voicemail_pass_sync.php', $cleaned); + } elseif (!str_contains($cleaned, 'externpassnotify=')) { + if (preg_match('/\[general\]/i', $cleaned)) { + $cleaned = preg_replace('/\[general\]/i', "[general]\nexternpassnotify=/usr/bin/php /var/www/nexus-pbx/scripts/voicemail_pass_sync.php", $cleaned, 1); + } + } if (!str_contains($cleaned, 'voicemail.custom.conf')) { $cleaned = rtrim($cleaned) . "\n\n#tryinclude \"voicemail.custom.conf\"\n"; } @@ -187,6 +223,8 @@ class SystemChecker } } + @mkdir('/var/spool/asterisk/voicemail/default', 0775, true); + $astConf = '/etc/asterisk/asterisk.conf'; if (is_file($astConf) && is_writable($astConf)) { $content = (string)file_get_contents($astConf); diff --git a/version.json b/version.json index b03e75c..3d98894 100644 --- a/version.json +++ b/version.json @@ -1,12 +1,13 @@ { - "version": "1.4.5", + "version": "1.4.6", "codename": "Helios", "release_date": "2026-11-04", "min_php_version": "8.2", "changelog": [ - "Application instantanée des mots de passe SIP et configurations des postes dans Asterisk (rechargement PJSIP en temps réel)", - "Suppression du délai d'application sur les postes, groupes de sonnerie et groupes de téléavertissement", - "Fiabilisation maximale de la mise à jour (rechargement web asynchrone non-bloquant et gestion d'erreurs tolérante)", - "Nouvelle boîte modale élégante et personnalisée pour confirmer le lancement des mises à jour" + "Fiabilisation clé en main de la messagerie vocale (*97 / *98) sur toute installation fraîche Debian (install.sh & fix.sh)", + "Neutralisation préventive des modules voicemail ODBC/IMAP incompatibles sur Debian (évite les conflits bloquant app_voicemail)", + "Inclusion automatique de voicemail.custom.conf et musiconhold.custom.conf dès l'installation", + "Génération et permissions strictes sur les répertoires de spool voicemail (/var/spool/asterisk/voicemail)", + "Contrôle d'intégrité renforcé dans le diagnostic système (SystemChecker)" ] }