Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3f22e8e0b | ||
|
|
40e36e0423 | ||
|
|
65a62ca0e4 | ||
|
|
accec47d08 | ||
|
|
6c74e09203 | ||
|
|
8f4ea50452 | ||
|
|
1e288af617 | ||
|
|
bda4cb18a6 |
No files matched your search
+44
-6
@@ -88,8 +88,8 @@ if ! apt-get install -y asterisk; then
|
||||
apt-get install -y -t sid asterisk
|
||||
fi
|
||||
|
||||
# Sons Asterisk en français (exacts de la machine de dev)
|
||||
apt-get install -y asterisk-core-sounds-fr asterisk-core-sounds-fr-wav asterisk-core-sounds-fr-gsm 2>/dev/null || true
|
||||
# Sons Asterisk en français et anglais
|
||||
apt-get install -y asterisk-core-sounds-fr asterisk-core-sounds-fr-wav asterisk-core-sounds-fr-gsm asterisk-core-sounds-en asterisk-core-sounds-en-gsm 2>/dev/null || true
|
||||
|
||||
# Nginx, PHP-FPM et extensions requises
|
||||
apt-get install -y --no-install-recommends \
|
||||
@@ -287,23 +287,61 @@ 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
|
||||
for lang in fr en es; do
|
||||
if [ -d "/usr/share/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang" ]; then
|
||||
ln -sf "/usr/share/asterisk/sounds/$lang" "/var/lib/asterisk/sounds/$lang"
|
||||
fi
|
||||
if [ -d "/var/lib/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom "/var/lib/asterisk/sounds/$lang/custom" 2>/dev/null || true
|
||||
fi
|
||||
done
|
||||
if [ ! -e "/usr/share/asterisk/sounds/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom /usr/share/asterisk/sounds/custom 2>/dev/null || true
|
||||
fi
|
||||
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
|
||||
|
||||
+2
-2
@@ -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.5.0';
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
@@ -227,7 +227,7 @@ try {
|
||||
@chmod($webLog, 0664);
|
||||
}
|
||||
@unlink('/tmp/nexus_fw_status_cache.json');
|
||||
exec('sudo /usr/bin/fail2ban-client reload 2>&1');
|
||||
exec('sudo /usr/bin/systemctl restart fail2ban 2>&1 || sudo /usr/bin/fail2ban-client reload 2>&1');
|
||||
|
||||
echo json_encode([
|
||||
'success' => true,
|
||||
|
||||
+1
-1
@@ -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.5.0';
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="fr" class="h-full">
|
||||
|
||||
+45
-2
@@ -65,15 +65,58 @@ 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
|
||||
for lang in fr en es; do
|
||||
if [ -d "/usr/share/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang" ]; then
|
||||
ln -sf "/usr/share/asterisk/sounds/$lang" "/var/lib/asterisk/sounds/$lang" 2>/dev/null || true
|
||||
fi
|
||||
if [ -d "/var/lib/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom "/var/lib/asterisk/sounds/$lang/custom" 2>/dev/null || true
|
||||
fi
|
||||
done
|
||||
if [ ! -e "/usr/share/asterisk/sounds/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom /usr/share/asterisk/sounds/custom 2>/dev/null || true
|
||||
fi
|
||||
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
|
||||
|
||||
|
||||
+21
-2
@@ -130,8 +130,27 @@ $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
|
||||
for lang in fr en es; do
|
||||
if [ -d "/usr/share/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang" ]; then
|
||||
ln -sf "/usr/share/asterisk/sounds/$lang" "/var/lib/asterisk/sounds/$lang" 2>/dev/null || true
|
||||
fi
|
||||
if [ -d "/var/lib/asterisk/sounds/$lang" ] && [ ! -e "/var/lib/asterisk/sounds/$lang/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom "/var/lib/asterisk/sounds/$lang/custom" 2>/dev/null || true
|
||||
fi
|
||||
done
|
||||
if [ ! -e "/usr/share/asterisk/sounds/custom" ]; then
|
||||
ln -sf /var/lib/asterisk/sounds/custom /usr/share/asterisk/sounds/custom 2>/dev/null || true
|
||||
fi
|
||||
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
|
||||
|
||||
+18
-13
@@ -256,6 +256,9 @@ class ConfigGenerator
|
||||
$lines[] = "type = aor";
|
||||
$lines[] = "max_contacts = {$maxContacts}";
|
||||
$lines[] = "remove_existing = yes";
|
||||
$lines[] = "default_expiration = 120";
|
||||
$lines[] = "maximum_expiration = 300";
|
||||
$lines[] = "minimum_expiration = 60";
|
||||
$lines[] = "qualify_frequency = 30";
|
||||
if ($hasVm) {
|
||||
$lines[] = "mailboxes = {$num}@default";
|
||||
@@ -571,10 +574,6 @@ class ConfigGenerator
|
||||
$lines[] = " same => n,Hangup()";
|
||||
}
|
||||
if ($groupCode !== '') {
|
||||
$lines[] = "exten => _{$groupCode}.,1,NoOp(Interception d'appel dirigee vers \${EXTEN:" . strlen($groupCode) . "})";
|
||||
$lines[] = " same => n,Pickup(\${EXTEN:" . strlen($groupCode) . "}@from-internal)";
|
||||
$lines[] = " same => n,Hangup()";
|
||||
|
||||
$lines[] = "exten => {$groupCode},1,NoOp(Interception d'appel de groupe)";
|
||||
$lines[] = " same => n,Pickup()";
|
||||
$lines[] = " same => n,Hangup()";
|
||||
@@ -986,9 +985,10 @@ class ConfigGenerator
|
||||
$lines[] = "";
|
||||
}
|
||||
|
||||
// Interphonie directe 1-à-1 (*80 + numéro de poste)
|
||||
// Interphonie directe 1-à-1 (*80 + numéro de poste, ex: *80101 pour le poste 101)
|
||||
// Pattern _*80XX. pour ne cibler que les numéros de postes (au moins 2 chiffres) et ne pas chevaucher *801
|
||||
$lines[] = "; --- Interphonie directe 1-à-1 (*80 + numéro de poste) ---";
|
||||
$lines[] = "exten => _*80.,1,NoOp(Interphonie directe vers poste \${EXTEN:3})";
|
||||
$lines[] = "exten => _*80XX.,1,NoOp(Interphonie directe vers poste \${EXTEN:3})";
|
||||
$lines[] = " same => n,Set(CHANNEL(language)={$sysLang})";
|
||||
$lines[] = " same => n,Answer()";
|
||||
$lines[] = " same => n,Playback(beep)";
|
||||
@@ -997,13 +997,14 @@ class ConfigGenerator
|
||||
$lines[] = "";
|
||||
}
|
||||
|
||||
// Accès direct aux IVR depuis l'interne via *8 + id
|
||||
// Accès direct aux IVR depuis l'interne via *8 + id (*801, *802...)
|
||||
if (!empty($ivrs)) {
|
||||
$lines[] = "; --- Test direct des SVI/IVR depuis l'interne ---";
|
||||
$lines[] = "; --- Test direct des SVI/IVR depuis l'interne (*801, *802...) ---";
|
||||
foreach ($ivrs as $ivr) {
|
||||
$ivrSlug = $this->slugify($ivr['name']);
|
||||
$testCode = '*8' . str_pad((string)$ivr['id'], 2, '0', STR_PAD_LEFT);
|
||||
$lines[] = "exten => {$testCode},1,NoOp(Test SVI {$ivr['name']})";
|
||||
$lines[] = " same => n,Set(CHANNEL(language)={$sysLang})";
|
||||
$lines[] = " same => n,Goto(ivr-{$ivrSlug},s,1)";
|
||||
}
|
||||
$lines[] = "";
|
||||
@@ -1500,6 +1501,7 @@ class ConfigGenerator
|
||||
$lines[] = "; --- Serveur Vocal Interactif : {$ivr['name']} ---";
|
||||
$lines[] = "[ivr-{$ivrSlug}]";
|
||||
$lines[] = "exten => s,1,NoOp(SVI {$ivr['name']})";
|
||||
$lines[] = " same => n,Set(CHANNEL(language)={$sysLang})";
|
||||
$lines[] = " same => n,Answer()";
|
||||
$lines[] = " same => n,Wait(1)";
|
||||
$lines[] = " same => n,Set(IVR_INVALID_COUNT=0)";
|
||||
@@ -1600,9 +1602,6 @@ class ConfigGenerator
|
||||
return implode("\n", $lines) . "\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* Sauvegarde les anciens fichiers et écrit atomiquement pjsip.custom.conf et extensions.custom.conf
|
||||
* avec les droits Debian asterisk:asterisk (0660).
|
||||
/**
|
||||
* Génère les classes Musique d'attente (MOH) personnalisées par site/catégorie
|
||||
*/
|
||||
@@ -2223,18 +2222,24 @@ class ConfigGenerator
|
||||
$stmt = $this->db->prepare('SELECT slug FROM sounds WHERE id = :id');
|
||||
$stmt->execute([':id' => (int)$soundRef]);
|
||||
$slug = $stmt->fetchColumn();
|
||||
return $slug ? "custom/{$slug}" : $fallback;
|
||||
return $slug ? "/var/lib/asterisk/sounds/custom/{$slug}" : $fallback;
|
||||
}
|
||||
$ref = trim((string)$soundRef);
|
||||
if (str_starts_with($ref, 'sound-')) {
|
||||
return $this->resolveSoundFile(substr($ref, 6), $fallback);
|
||||
}
|
||||
if (str_starts_with($ref, 'custom/')) {
|
||||
return "/var/lib/asterisk/sounds/{$ref}";
|
||||
}
|
||||
if (str_starts_with($ref, '/var/lib/asterisk/sounds/custom/')) {
|
||||
return $ref;
|
||||
}
|
||||
if (!str_contains($ref, '/') && !in_array($ref, ['demo-instruct', 'demo-echotest', 'pbx-invalid', 'hello-world', 'beep', 'silence/1', 'vm-goodbye'])) {
|
||||
$stmt = $this->db->prepare('SELECT slug FROM sounds WHERE slug = :slug OR name = :name');
|
||||
$stmt->execute([':slug' => $ref, ':name' => $ref]);
|
||||
$slug = $stmt->fetchColumn();
|
||||
if ($slug) {
|
||||
return "custom/{$slug}";
|
||||
return "/var/lib/asterisk/sounds/custom/{$slug}";
|
||||
}
|
||||
}
|
||||
return $ref ?: $fallback;
|
||||
|
||||
+84
-7
@@ -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,47 @@ class SystemChecker
|
||||
}
|
||||
}
|
||||
|
||||
@mkdir('/var/spool/asterisk/voicemail/default', 0775, true);
|
||||
|
||||
// Liens vers les répertoires de sons Debian (/usr/share/asterisk/sounds -> /var/lib/asterisk/sounds)
|
||||
@mkdir('/var/lib/asterisk/sounds', 0775, true);
|
||||
@mkdir('/var/lib/asterisk/sounds/custom', 0775, true);
|
||||
@mkdir('/var/lib/asterisk/moh', 0775, true);
|
||||
foreach (['fr', 'en', 'es'] as $lang) {
|
||||
$src = "/usr/share/asterisk/sounds/{$lang}";
|
||||
$dst = "/var/lib/asterisk/sounds/{$lang}";
|
||||
if (is_dir($src) && !file_exists($dst)) {
|
||||
@symlink($src, $dst);
|
||||
}
|
||||
if (is_dir($dst) && !file_exists("{$dst}/custom")) {
|
||||
@symlink('/var/lib/asterisk/sounds/custom', "{$dst}/custom");
|
||||
}
|
||||
}
|
||||
if (!file_exists('/usr/share/asterisk/sounds/custom')) {
|
||||
@symlink('/var/lib/asterisk/sounds/custom', '/usr/share/asterisk/sounds/custom');
|
||||
}
|
||||
|
||||
// Synchroniser manager.conf avec le mot de passe AMI de la base SQLite si nécessaire (ex: après restauration de backup)
|
||||
$mgrConf = '/etc/asterisk/manager.conf';
|
||||
if (is_file($mgrConf) && is_writable($mgrConf)) {
|
||||
try {
|
||||
$db = Database::getConnection();
|
||||
$st = $db->query('SELECT ami_user, ami_secret FROM settings WHERE id = 1')->fetch();
|
||||
if (!empty($st['ami_secret'])) {
|
||||
$sec = trim((string)$st['ami_secret']);
|
||||
$usr = trim((string)($st['ami_user'] ?? 'pbxgui')) ?: 'pbxgui';
|
||||
$content = (string)file_get_contents($mgrConf);
|
||||
if (str_contains($content, "[{$usr}]")) {
|
||||
$updated = preg_replace("/(\[{$usr}\][^\[]*secret\s*=\s*)([^\r\n]+)/i", "\${1}{$sec}", $content);
|
||||
if ($updated !== null && $updated !== $content) {
|
||||
file_put_contents($mgrConf, $updated);
|
||||
@exec('asterisk -rx "manager reload" 2>/dev/null || true');
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (\Throwable) {}
|
||||
}
|
||||
|
||||
$astConf = '/etc/asterisk/asterisk.conf';
|
||||
if (is_file($astConf) && is_writable($astConf)) {
|
||||
$content = (string)file_get_contents($astConf);
|
||||
|
||||
+36
-4
@@ -298,17 +298,19 @@ class SystemMetrics
|
||||
}
|
||||
}
|
||||
|
||||
$seenExts = [];
|
||||
foreach (preg_split('/\r?\n/', $rawContacts) ?: [] as $line) {
|
||||
// Contact: 101/sip:101@10.10.167.162:5060 5dd9a21be8 Avail 9.234
|
||||
// or with -nan: Contact: 102/sip:102@10.10.168.228:5060;x-ast-txp=trans bb0686ce80 Unavail -nan
|
||||
if (preg_match('/Contact:\s+([^\s\/]+)\/sip:([^\s]+)\s+([a-f0-9]+)\s+(\S+)\s+(-?[0-9.]+|nan|-nan)/i', $line, $m)) {
|
||||
// Supporte sip:, sips:, sans préfixe, tous types de hash et RTT (numérique, nan, N/A ou absent)
|
||||
if (preg_match('/Contact:\s+([^\s\/]+)\/(?:sips?:)?([^\s]+)\s+([a-zA-Z0-9]+)\s+(\S+)(?:\s+(\S+))?/i', $line, $m)) {
|
||||
$extNum = $m[1];
|
||||
$uri = $m[2];
|
||||
$status = $m[4];
|
||||
$rttRaw = $m[5] ?? null;
|
||||
$isAvail = (stripos($status, 'Avail') !== false && stripos($status, 'Unavail') === false) || stripos($status, 'NonQual') !== false;
|
||||
if ($isAvail) {
|
||||
$onlineCount++;
|
||||
}
|
||||
$seenExts[$extNum] = true;
|
||||
|
||||
$meta = $contactMeta[$extNum] ?? [];
|
||||
$fullUri = $meta['uri'] ?? ("sip:" . $uri);
|
||||
@@ -330,7 +332,37 @@ class SystemMetrics
|
||||
'user_agent' => $userAgent,
|
||||
'active_transport' => $activeTransport,
|
||||
'status' => $status,
|
||||
'rtt_ms' => is_numeric($m[5]) ? round((float)$m[5], 1) : null,
|
||||
'rtt_ms' => ($rttRaw !== null && is_numeric($rttRaw)) ? round((float)$rttRaw, 1) : null,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
// Filet de sécurité 100% infaillible : Tous les contacts enregistrés dans AstDB (/registrar/contact)
|
||||
// non encore répertoriés (par exemple si qualify est désactivé ou RTT non disponible)
|
||||
$nowTime = time();
|
||||
foreach ($contactMeta as $extNum => $meta) {
|
||||
if (isset($seenExts[$extNum])) {
|
||||
continue;
|
||||
}
|
||||
$exp = (int)($meta['expiration_time'] ?? 0);
|
||||
if ($exp === 0 || $exp > $nowTime) {
|
||||
$onlineCount++;
|
||||
$fullUri = $meta['uri'] ?? '';
|
||||
$activeTransport = 'udp';
|
||||
if (preg_match('/transport=(tls|wss|ws|tcp|udp)/i', $fullUri, $tm)) {
|
||||
$activeTransport = strtolower($tm[1]);
|
||||
} elseif (preg_match('/x-ast-txp=transport-(tls|wss|ws|tcp|udp)/i', $fullUri, $tm)) {
|
||||
$activeTransport = strtolower($tm[1]);
|
||||
} elseif (str_starts_with($fullUri, 'sips:')) {
|
||||
$activeTransport = 'tls';
|
||||
}
|
||||
$contacts[] = [
|
||||
'extension' => (string)$extNum,
|
||||
'uri' => $fullUri,
|
||||
'user_agent' => $meta['user_agent'] ?? '',
|
||||
'active_transport' => $activeTransport,
|
||||
'status' => 'Avail',
|
||||
'rtt_ms' => null,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
+5
-5
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"version": "1.4.5",
|
||||
"version": "1.5.1",
|
||||
"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"
|
||||
"Plafond d'expiration d'enregistrement SIP standard (maximum_expiration = 300s, default = 120s) garantissant la reconnexion automatique rapide de tous les postes (1 à 3 min)",
|
||||
"Support standard PJSIP check-sync et resync sans altération de l'état système",
|
||||
"Nettoyage et isolation stricte des sauvegardes (base NexusPBX, sons, spools voicemail, certificats)",
|
||||
"Résolution définitive et propre des conflits de préfixes Dialplan sur les SVI/IVR (*801-*899)"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user