Services: DHCRelay - add logging into its own space

This commit is contained in:
Ad Schellevis 2024-05-21 10:02:45 +02:00
parent 4e16134898
commit 136e8178d2
4 changed files with 19 additions and 2 deletions

1
plist
View File

@ -1299,6 +1299,7 @@
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/audit.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/configd.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/dhcpd.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/dhcrelay.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/dnsmasq.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/filter.conf
/usr/local/opnsense/service/templates/OPNsense/Syslog/local/firewall.conf

View File

@ -42,6 +42,13 @@ function dhcrelay_run()
];
}
function dhcrelay_syslog()
{
return [
'dhcrelay' => ['facility' => ['dhcrelay']]
];
}
function dhcrelay_services()
{
$mdl = new \OPNsense\DHCRelay\DHCRelay();
@ -132,7 +139,7 @@ function dhcrelay_configure_do($verbose = false, $id = null)
continue;
}
$cmd = [exec_safe('daemon -f -p %s', "/var/run/dhcrelay-{$relay->getAttribute('uuid')}.pid")];
$cmd = [exec_safe('daemon -S -T dhcrelay -f -p %s', "/var/run/dhcrelay-{$relay->getAttribute('uuid')}.pid")];
$cmd[] = sprintf('/usr/local/sbin/dhcrelay%s -d', $family == 'inet6' ? '6' : '');
if (!empty((string)$relay->agent_info)) {
$cmd[] = sprintf('-o%s', $family == 'inet' ? 'r' : '');

View File

@ -1,5 +1,8 @@
<menu>
<Services>
<DHCRelay cssClass="fa fa-bullseye fa-fw" url="/ui/dhcrelay/relay"/>
<DHCRelay cssClass="fa fa-bullseye fa-fw">
<Administration url="/ui/dhcrelay/relay"/>
<Log order="40" VisibleName="Log File" url="/ui/diagnostics/log/core/dhcrelay"/>
</DHCRelay>
</Services>
</menu>

View File

@ -0,0 +1,6 @@
###################################################################
# Local syslog-ng configuration filter definition [dhcrelay].
###################################################################
filter f_local_dhcrelay {
program("dhcrelay");
};