From f44dbecd79ade0fabd2c61e9b807cc044bc17608 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 15 Jul 2022 10:26:54 +0200
Subject: [PATCH] dnsmasq: roll this back a bit #5119

---
 plist                                                         | 2 +-
 src/etc/inc/plugins.inc.d/unbound.inc                         | 2 +-
 .../scripts/dhcp/{lease_watcher.py => unbound_watcher.py}     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/opnsense/scripts/dhcp/{lease_watcher.py => unbound_watcher.py} (98%)

diff --git a/plist b/plist
index b81eed065..bcf229859 100644
--- a/plist
+++ b/plist
@@ -739,8 +739,8 @@
 /usr/local/opnsense/scripts/auth/add_user.php
 /usr/local/opnsense/scripts/dhcp/cleanup_leases4.php
 /usr/local/opnsense/scripts/dhcp/get_leases.py
-/usr/local/opnsense/scripts/dhcp/lease_watcher.py
 /usr/local/opnsense/scripts/dhcp/prefixes.php
+/usr/local/opnsense/scripts/dhcp/unbound_watcher.py
 /usr/local/opnsense/scripts/dns/query_dns.py
 /usr/local/opnsense/scripts/filter/delete_table.py
 /usr/local/opnsense/scripts/filter/download_geoip.py
diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index 1222bfbb3..d1d1ca22a 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -423,7 +423,7 @@ function unbound_configure_do($verbose = false, $interface = '')
         if (isset($config['unbound']['regdhcpdomain'])) {
             $domain = $config['unbound']['regdhcpdomain'];
         }
-        mwexecf('/usr/local/opnsense/scripts/dhcp/lease_watcher.py --domain %s', $domain);
+        mwexecf('/usr/local/opnsense/scripts/dhcp/unbound_watcher.py --domain %s', $domain);
     }
 
     if ($verbose) {
diff --git a/src/opnsense/scripts/dhcp/lease_watcher.py b/src/opnsense/scripts/dhcp/unbound_watcher.py
similarity index 98%
rename from src/opnsense/scripts/dhcp/lease_watcher.py
rename to src/opnsense/scripts/dhcp/unbound_watcher.py
index 5ac40e10e..258894d35 100755
--- a/src/opnsense/scripts/dhcp/lease_watcher.py
+++ b/src/opnsense/scripts/dhcp/unbound_watcher.py
@@ -226,12 +226,12 @@ if __name__ == '__main__':
             config=inputargs.config
         )
     else:
-        syslog.syslog(syslog.LOG_NOTICE, 'daemonize dhcpd lease watcher.')
+        syslog.syslog(syslog.LOG_NOTICE, 'daemonize unbound dhcpd watcher.')
         cmd  = lambda : run_watcher(
             target_filename=inputargs.target,
             default_domain=inputargs.domain,
             watch_file=inputargs.source,
             config=inputargs.config
         )
-        daemon = Daemonize(app="lease_watcher", pid=inputargs.pid, action=cmd)
+        daemon = Daemonize(app="unbound_dhcpd", pid=inputargs.pid, action=cmd)
         daemon.start()