From 3a3123485f2ea7b253caa1c49f19c82a0eaa0b37 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sun, 24 Sep 2023 23:22:31 -0500
Subject: mdns: T5615: Rename avahi-daemon config file

Rename avahi-daemon config file to avahi-daemon.conf.j2 to match the
convention used by other config files.
---
 data/templates/mdns-repeater/avahi-daemon.conf.j2 | 27 +++++++++++++++++++++++
 data/templates/mdns-repeater/avahi-daemon.j2      | 27 -----------------------
 src/conf_mode/service_mdns-repeater.py            |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 data/templates/mdns-repeater/avahi-daemon.conf.j2
 delete mode 100644 data/templates/mdns-repeater/avahi-daemon.j2

diff --git a/data/templates/mdns-repeater/avahi-daemon.conf.j2 b/data/templates/mdns-repeater/avahi-daemon.conf.j2
new file mode 100644
index 000000000..d562c048f
--- /dev/null
+++ b/data/templates/mdns-repeater/avahi-daemon.conf.j2
@@ -0,0 +1,27 @@
+### Autogenerated by service_mdns-repeater.py ###
+[server]
+use-ipv4={{ 'yes' if ip_version in ['ipv4', 'both'] else 'no' }}
+use-ipv6={{ 'yes' if ip_version in ['ipv6', 'both'] else 'no' }}
+allow-interfaces={{ interface | join(', ') }}
+{% if browse_domain is vyos_defined and browse_domain | length %}
+browse-domains={{ browse_domain | join(', ') }}
+{% endif %}
+disallow-other-stacks=no
+
+[wide-area]
+enable-wide-area=yes
+
+[publish]
+disable-publishing=yes
+disable-user-service-publishing=yes
+publish-addresses=no
+publish-hinfo=no
+publish-workstation=no
+publish-aaaa-on-ipv4=no
+publish-a-on-ipv6=no
+
+[reflector]
+enable-reflector=yes
+{% if allow_service is vyos_defined and allow_service | length %}
+reflect-filters={{ allow_service | join(', ') }}
+{% endif %}
diff --git a/data/templates/mdns-repeater/avahi-daemon.j2 b/data/templates/mdns-repeater/avahi-daemon.j2
deleted file mode 100644
index d562c048f..000000000
--- a/data/templates/mdns-repeater/avahi-daemon.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-### Autogenerated by service_mdns-repeater.py ###
-[server]
-use-ipv4={{ 'yes' if ip_version in ['ipv4', 'both'] else 'no' }}
-use-ipv6={{ 'yes' if ip_version in ['ipv6', 'both'] else 'no' }}
-allow-interfaces={{ interface | join(', ') }}
-{% if browse_domain is vyos_defined and browse_domain | length %}
-browse-domains={{ browse_domain | join(', ') }}
-{% endif %}
-disallow-other-stacks=no
-
-[wide-area]
-enable-wide-area=yes
-
-[publish]
-disable-publishing=yes
-disable-user-service-publishing=yes
-publish-addresses=no
-publish-hinfo=no
-publish-workstation=no
-publish-aaaa-on-ipv4=no
-publish-a-on-ipv6=no
-
-[reflector]
-enable-reflector=yes
-{% if allow_service is vyos_defined and allow_service | length %}
-reflect-filters={{ allow_service | join(', ') }}
-{% endif %}
diff --git a/src/conf_mode/service_mdns-repeater.py b/src/conf_mode/service_mdns-repeater.py
index d4b8ef8c4..6909731ff 100755
--- a/src/conf_mode/service_mdns-repeater.py
+++ b/src/conf_mode/service_mdns-repeater.py
@@ -100,7 +100,7 @@ def generate(mdns):
         if len(mdns['interface']) < 2:
             return None
 
-    render(config_file, 'mdns-repeater/avahi-daemon.j2', mdns)
+    render(config_file, 'mdns-repeater/avahi-daemon.conf.j2', mdns)
     return None
 
 def apply(mdns):
-- 
cgit v1.2.3