diff --git a/CHANGELOG.md b/CHANGELOG.md index f866ca7..0018572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.8.3] - 2026-05-22 + +### Improved +- Modificada accion WolAction, calcula la ip de broadcast para el comando wakeonlan, para ello, detecta la mascara de red usando la subred configurada en el dhcp, si no se usa ogdhcp, busca la máscara de red en la configuración de la OU, en caso de tampoco encontrala, usa la ip de broadcast por defecto del comando wakeonlan + ## [1.8.2] - 2026-05-18 ### Improved diff --git a/config/api_platform/OrganizationalUnit.yaml b/config/api_platform/OrganizationalUnit.yaml index 2853aa1..b383a20 100644 --- a/config/api_platform/OrganizationalUnit.yaml +++ b/config/api_platform/OrganizationalUnit.yaml @@ -1,5 +1,6 @@ resources: App\Entity\OrganizationalUnit: + order: { name: 'ASC' } processor: App\State\Processor\OrganizationalUnitProcessor output: App\Dto\Output\OrganizationalUnitOutput input: App\Dto\Input\OrganizationalUnitInput diff --git a/etc/systemd/system/journal-pull@.service b/etc/systemd/system/journal-pull@.service index b15e956..56de325 100644 --- a/etc/systemd/system/journal-pull@.service +++ b/etc/systemd/system/journal-pull@.service @@ -6,10 +6,10 @@ Wants=network-online.target [Service] User=systemd-journal-remote Group=systemd-journal-remote -ExecStartPre=/bin/sh -c 'f=/var/log/journal/remote/%i.journal; [ -f "$f" ] && journalctl --file="$f" -n 1 --no-pager 2>/dev/null | grep -q "." || rm -f "$f"' -ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=none --output=/var/log/journal/remote/%i.journal +ExecStartPre=/bin/mkdir -p /var/log/journal/remote/%i +ExecStart=/usr/lib/systemd/systemd-journal-remote --url=http://%i:19531/entries?boot=0&SYSLOG_IDENTIFIER=ogcore&SYSLOG_IDENTIFIER=oggui&SYSLOG_IDENTIFIER=ogdhcp&SYSLOG_IDENTIFIER=ogboot&SYSLOG_IDENTIFIER=ogrepo-api&SYSLOG_IDENTIFIER=ogrepo-api_DEBUG&SYSLOG_IDENTIFIER=kea-dhcp4&SYSLOG_IDENTIFIER=kea-ctrl-agent&SYSLOG_IDENTIFIER=DhcpLFC&SYSLOG_IDENTIFIER=kea-dhcp6&SYSLOG_IDENTIFIER=tftpd-hpa&SYSLOG_IDENTIFIER=%%28smbd%%29&SYSLOG_IDENTIFIER=%%28nmbd%%29 --split-mode=host --output=/var/log/journal/remote/%i/ Restart=always -RestartSec=10 +RestartSec=30 [Install] WantedBy=multi-user.target diff --git a/src/Controller/OgRepository/WoLAction.php b/src/Controller/OgRepository/WoLAction.php index c712ac0..a5b9562 100644 --- a/src/Controller/OgRepository/WoLAction.php +++ b/src/Controller/OgRepository/WoLAction.php @@ -48,19 +48,33 @@ class WoLAction extends AbstractOgRepositoryController throw new BadRequestHttpException('IP is required'); } + // 1. Buscamos la máscara. Si no hay por ningún lado, devolverá null. + $netmask = $client->getSubnet()?->getNetmask()?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getNetmask(); + + // 2. Broadcast por defecto (global) + $broadcastIp = "255.255.255.255"; + + // 3. Si encontramos una máscara válida, calculamos el broadcast específico + if ($netmask) { + $ipLong = ip2long($client->getIp()); + $netmaskLong = ip2long($netmask); + $broadcastIp = long2ip($ipLong | (~$netmaskLong)); + } + $params = [ 'json' => [ - 'broadcast_ip' => '255.255.255.255', + 'broadcast_ip' => $broadcastIp, 'mac' => $client->getMac() ] ]; - $this->logger->info('Sending WoL to client', ['mac' => $client->getMac()]); + + $this->logger->info('Sending WoL to client', ['mac' => $client->getMac(), 'broadcast_ip' => $broadcastIp]); $content = $this->createRequest('POST', 'http://'.$repository->getIp(). ':8006/ogrepository/v1/wol', $params); if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) { - $this->logger->error('Error sending WoL to client', ['mac' => $client->getMac()]); + $this->logger->error('Error sending WoL to client', ['mac' => $client->getMac(), 'broadcast_ip' => $broadcastIp]); continue; } diff --git a/src/Controller/System/DiskLogsAction.php b/src/Controller/System/DiskLogsAction.php index a9b1078..76e01da 100644 --- a/src/Controller/System/DiskLogsAction.php +++ b/src/Controller/System/DiskLogsAction.php @@ -39,15 +39,15 @@ class DiskLogsAction extends AbstractController $args = ['--no-pager', '--output=json', sprintf('-n %d', $lines)]; if ($host) { - // Host remoto: leer del fichero journal nombrado por IP - $journalFile = sprintf('%s/%s.journal', self::REMOTE_JOURNAL_DIR, $host); - if (!file_exists($journalFile)) { + // Host remoto: leer del directorio journal nombrado por IP + $journalDir = sprintf('%s/%s', self::REMOTE_JOURNAL_DIR, $host); + if (!is_dir($journalDir)) { return new JsonResponse( ['error' => sprintf('No se encontró el journal para el host %s', $host)], Response::HTTP_NOT_FOUND ); } - $args[] = sprintf('--file=%s', escapeshellarg($journalFile)); + $args[] = sprintf('--directory=%s', escapeshellarg($journalDir)); } // Múltiples SYSLOG_IDENTIFIER se pasan como matches separados → journalctl los aplica con OR