diff --git a/plist b/plist index 55de2cc90..d79ff42c0 100644 --- a/plist +++ b/plist @@ -386,6 +386,7 @@ /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogPipe.xml /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogQueue.xml /usr/local/opnsense/mvc/app/controllers/OPNsense/TrafficShaper/forms/dialogRule.xml +/usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/AdvancedController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/DiagnosticsController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/ServiceController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/Api/SettingsController.php @@ -394,6 +395,7 @@ /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/ForwardController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/OverridesController.php /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/StatsController.php +/usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/advanced.xml /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDomainOverride.xml /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogDot.xml /usr/local/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/dialogHostAlias.xml @@ -666,6 +668,7 @@ /usr/local/opnsense/mvc/app/views/OPNsense/Syslog/index.volt /usr/local/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt /usr/local/opnsense/mvc/app/views/OPNsense/TrafficShaper/statistics.volt +/usr/local/opnsense/mvc/app/views/OPNsense/Unbound/advanced.volt /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/dnsbl.volt /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/dot.volt /usr/local/opnsense/mvc/app/views/OPNsense/Unbound/overrides.volt @@ -1057,6 +1060,7 @@ /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng-lockout.conf /usr/local/opnsense/service/templates/OPNsense/Syslog/syslog-ng.conf /usr/local/opnsense/service/templates/OPNsense/Unbound/core/+TARGETS +/usr/local/opnsense/service/templates/OPNsense/Unbound/core/advanced.conf /usr/local/opnsense/service/templates/OPNsense/Unbound/core/blocklists.conf /usr/local/opnsense/service/templates/OPNsense/Unbound/core/domainoverrides.conf /usr/local/opnsense/service/templates/OPNsense/Unbound/core/dot.conf diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc index 871a04163..b25354415 100644 --- a/src/etc/inc/plugins.inc.d/unbound.inc +++ b/src/etc/inc/plugins.inc.d/unbound.inc @@ -313,6 +313,7 @@ pidfile: /var/run/unbound.pid root-hints: /var/unbound/root.hints use-syslog: yes port: {$port} +include: /var/unbound/advanced.conf verbosity: {$verbosity} extended-statistics: {$extended_statistics} log-queries: {$log_queries} diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/AdvancedController.php b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/AdvancedController.php new file mode 100755 index 000000000..e67b27552 --- /dev/null +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/AdvancedController.php @@ -0,0 +1,40 @@ +view->advancedForm = $this->getForm('advanced'); + $this->view->pick('OPNsense/Unbound/advanced'); + } +} diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/advanced.xml b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/advanced.xml new file mode 100755 index 000000000..274e29fee --- /dev/null +++ b/src/opnsense/mvc/app/controllers/OPNsense/Unbound/forms/advanced.xml @@ -0,0 +1,183 @@ +
\ No newline at end of file diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml index 21e92392e..27ca5d690 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/ACL/ACL.xml @@ -14,7 +14,8 @@