From ae079764395f3b770e52134eaf5610a3693f52e4 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Tue, 6 May 2025 20:57:41 +0200
Subject: [PATCH] bundles/nfs-server: add avahi config

---
 bundles/nfs-server/files/avahi.service | 10 +++++
 bundles/nfs-server/files/exports       |  2 +-
 bundles/nfs-server/items.py            | 51 +++++++++++++++++---------
 nodes/home/nas.py                      |  2 +-
 4 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 bundles/nfs-server/files/avahi.service

diff --git a/bundles/nfs-server/files/avahi.service b/bundles/nfs-server/files/avahi.service
new file mode 100644
index 0000000..394cdca
--- /dev/null
+++ b/bundles/nfs-server/files/avahi.service
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone='no'?>
+<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
+<service-group>
+  <name replace-wildcards="yes">NFS ${path} on %h</name>
+  <service>
+    <type>_nfs._tcp</type>
+    <port>2049</port>
+    <txt-record>path=${path}</txt-record>
+  </service>
+</service-group>
diff --git a/bundles/nfs-server/files/exports b/bundles/nfs-server/files/exports
index ad2ca4c..ac9c8f8 100644
--- a/bundles/nfs-server/files/exports
+++ b/bundles/nfs-server/files/exports
@@ -1,4 +1,4 @@
-% for path, shares in sorted(node.metadata['nfs-server']['shares'].items()):
+% for path, shares in sorted(node.metadata.get('nfs-server/shares', {}).items()):
 %  for share_target, share_options in sorted(shares.items()):
 %   for ip_list in repo.libs.tools.resolve_identifier(repo, share_target).values():
 %    for ip in sorted(ip_list):
diff --git a/bundles/nfs-server/items.py b/bundles/nfs-server/items.py
index dacbc48..ce025cf 100644
--- a/bundles/nfs-server/items.py
+++ b/bundles/nfs-server/items.py
@@ -1,25 +1,40 @@
-files = {
-    '/etc/exports': {
-        'content_type': 'mako',
-        'triggers': {
-            'action:nfs_reload_shares',
-        },
-    },
-    '/etc/default/nfs-kernel-server': {
-        'source': 'etc-default',
-        'triggers': {
-            'svc_systemd:nfs-server:restart',
-        },
+from re import sub
+
+files['/etc/exports'] = {
+    'content_type': 'mako',
+    'triggers': {
+        'action:nfs_reload_shares',
     },
 }
 
-actions = {
-    'nfs_reload_shares': {
-        'command': 'exportfs -a',
-        'triggered': True,
+files['/etc/default/nfs-kernel-server'] = {
+    'source': 'etc-default',
+    'triggers': {
+        'svc_systemd:nfs-server:restart',
     },
 }
 
-svc_systemd = {
-    'nfs-server': {},
+actions['nfs_reload_shares'] = {
+    'command': 'exportfs -a',
+    'triggered': True,
 }
+
+svc_systemd['nfs-server'] = {}
+
+if node.has_bundle('avahi-daemon'):
+    for path, shares in node.metadata.get('nfs-server/shares', {}).items():
+        create_avahi_file = False
+        for share_target, share_options in shares.items():
+            if ',insecure,' in f',{share_options},':
+                create_avahi_file = True
+
+        if create_avahi_file:
+            share_name_normalized = sub('[^a-z0-9-_]+', '_', path)
+
+            files[f'/etc/avahi/services/nfs{share_name_normalized}.service'] = {
+                'source': 'avahi.service',
+                'content_type': 'mako',
+                'context': {
+                    'path': path,
+                },
+            }
diff --git a/nodes/home/nas.py b/nodes/home/nas.py
index 2f210d6..e98955c 100644
--- a/nodes/home/nas.py
+++ b/nodes/home/nas.py
@@ -141,7 +141,7 @@ nodes['home.nas'] = {
                     'home.downloadhelper': 'rw,all_squash,anonuid=65534,anongid=1012,no_subtree_check',
                 },
                 '/storage/nas': {
-                    '172.19.138.0/24': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check',
+                    '172.19.138.0/24': 'ro,all_squash,anonuid=65534,anongid=65534,no_subtree_check,insecure',
                 },
                 '/srv/paperless': {
                     'home.paperless': 'rw,all_squash,anonuid=65534,anongid=65534,no_subtree_check',