dnsmasq: migrate to MVC/API, dnsmasq supports custom includes as well, let's make sure to signal the user when they exist. for https://github.com/opnsense/core/issues/7905

This commit is contained in:
Ad Schellevis 2025-02-08 10:42:55 +01:00
parent 1a2eeb9044
commit 44eaf077b8
2 changed files with 56 additions and 0 deletions

1
plist
View File

@ -579,6 +579,7 @@
/usr/local/opnsense/mvc/app/library/OPNsense/System/AbstractStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/CrashReporterStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/DiskSpaceStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/DnsmasqOverrideStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/FirewallStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/IPsecOverrideStatus.php
/usr/local/opnsense/mvc/app/library/OPNsense/System/Status/LiveMediaStatus.php

View File

@ -0,0 +1,55 @@
<?php
/*
* Copyright (C) 2025 Deciso B.V.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
namespace OPNsense\System\Status;
use OPNsense\System\AbstractStatus;
use OPNsense\System\SystemStatusCode;
class DnsmasqOverrideStatus extends AbstractStatus
{
public function __construct()
{
$this->internalPriority = 2;
$this->internalPersistent = true;
$this->internalTitle = gettext('Configuration override');
$this->internalIsBanner = true;
$this->internalScope[] = '/ui/dnsmasq/*';
$this->internalScope[] = '/ui/dnsmasq';
}
public function collectStatus()
{
if (count(glob('/usr/local/etc/dnsmasq.conf.d/*.conf'))) {
$this->internalMessage = gettext(
'The configuration contains manual overwrites, these may interfere with the settings configured here.'
);
$this->internalStatus = SystemStatusCode::NOTICE;
}
}
}