From 3e713e5c96081206c47a44cf044428bcfa27cd02 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Fri, 29 Dec 2023 18:21:33 -0600
Subject: dns: T5959: Streamline dns forwarding service

Streamline configuration and operation of dns forwarding service in
following ways:

- Remove `dns_forwarding_reset.py` as its functionality is now covered
  by `dns.py`
- Adjust function names in `dns.py` to disambiguate between DNS
  forwarding and dynamic DNS
- Remove `dns_forwarding_restart.sh` as its functionality is inlined in
  `dns-forwarding.xml`
- Templatize systemd override for `pdns-recursor.service` and move the
  generated override files in /run. This ensures that the override files
  are always generated afresh after boot
- Simplify the systemd override file by removing the redundant overrides
- Relocate configuration path for pdns-recursor to `/run/pdns-recursor`
  and utilize the `RuntimeDirectory` default that pdns-recursor expects
- We do not need to use custom `--socket-dir` path anymore, the default
  path (viz., `/run/pdns-recursor` is fine)

(cherry picked from commit 1c1fb5fb4bd7c0d205b28caf90357ad56423464f)
---
 op-mode-definitions/dns-forwarding.xml.in | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'op-mode-definitions')

diff --git a/op-mode-definitions/dns-forwarding.xml.in b/op-mode-definitions/dns-forwarding.xml.in
index a4c650c38..ebedae6eb 100644
--- a/op-mode-definitions/dns-forwarding.xml.in
+++ b/op-mode-definitions/dns-forwarding.xml.in
@@ -11,7 +11,7 @@
             <children>
               <node name="forwarding">
                 <properties>
-                  <help>Monitor last lines of DNS forwarding</help>
+                  <help>Monitor last lines of DNS Forwarding</help>
                 </properties>
                 <command>journalctl --no-hostname --follow --boot --unit pdns-recursor.service</command>
               </node>
@@ -47,12 +47,12 @@
         <children>
           <node name="forwarding">
             <properties>
-              <help>Show DNS forwarding information</help>
+              <help>Show DNS Forwarding information</help>
             </properties>
             <children>
               <leafNode name="statistics">
                 <properties>
-                  <help>Show DNS forwarding statistics</help>
+                  <help>Show DNS Forwarding statistics</help>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/dns.py show_forwarding_statistics</command>
               </leafNode>
@@ -71,9 +71,9 @@
         <children>
           <leafNode name="forwarding">
             <properties>
-              <help>Restart DNS forwarding service</help>
+              <help>Restart DNS Forwarding service</help>
             </properties>
-            <command>sudo ${vyos_op_scripts_dir}/dns_forwarding_restart.sh</command>
+            <command>if cli-shell-api existsActive service dns forwarding; then sudo systemctl restart pdns-recursor.service; else echo "DNS forwarding not configured"; fi</command>
           </leafNode>
         </children>
       </node>
@@ -88,19 +88,19 @@
         <children>
           <node name="forwarding">
             <properties>
-              <help>Reset DNS forwarding cache</help>
+              <help>Reset DNS Forwarding cache</help>
             </properties>
             <children>
               <tagNode name="domain">
-                <command>sudo ${vyos_op_scripts_dir}/dns_forwarding_reset.py $5</command>
+                <command>sudo ${vyos_op_scripts_dir}/dns.py reset_forwarding --domain $5</command>
                 <properties>
-                  <help>Reset DNS forwarding cache for a domain</help>
+                  <help>Reset DNS Forwarding cache for a domain</help>
                 </properties>
               </tagNode>
               <leafNode name="all">
-                <command>sudo ${vyos_op_scripts_dir}/dns_forwarding_reset.py --all</command>
+                <command>sudo ${vyos_op_scripts_dir}/dns.py reset_forwarding --all</command>
                 <properties>
-                  <help>Reset DNS forwarding cache</help>
+                  <help>Reset DNS Forwarding cache for all domains</help>
                 </properties>
               </leafNode>
             </children>
-- 
cgit v1.2.3