From d0114aeffb90d57234ce63a905ac8b9317daa17b Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Tue, 18 Nov 2025 12:36:33 +0100
Subject: [PATCH] Systemd mounts for auto02

---
 roles/backup_server/tasks/main.yaml |  62 +++++++++++++++++
 roles/common/tasks/linux.yaml       |   4 --
 roles/file_server/tasks/main.yaml   |  31 +++++++++
 site.yaml                           | 104 +++++++++++++++-------------
 4 files changed, 147 insertions(+), 54 deletions(-)
 create mode 100644 roles/backup_server/tasks/main.yaml
 create mode 100644 roles/file_server/tasks/main.yaml

diff --git a/roles/backup_server/tasks/main.yaml b/roles/backup_server/tasks/main.yaml
new file mode 100644
index 0000000..1462f5a
--- /dev/null
+++ b/roles/backup_server/tasks/main.yaml
@@ -0,0 +1,62 @@
+
+- name: Generate Automounts
+  include_role: 
+    name: alysoid.ansible-systemd-mount
+  vars:
+    catena_mount:
+      - name: Mount {{ mount_point }}
+        options:
+          Mount:
+            What: /dev/backup/{{ mount_point }}
+            Where: /backup/{{ mount_point }}
+            Type: btrfs
+            Options: defaults,compress=lzo,space_cache=v2
+          Unit:
+            After: network.target
+          Install:
+            WantedBy: network.target
+    catena_automount:
+      - name: Automount {{ mount_point }}
+        options:
+          Automount:
+            Where: /backup/{{ mount_point }}
+            TimeoutIdleSec: 30
+          Unit:
+            After: network.target
+          Install:
+            WantedBy: network.target
+  loop:
+  - yori
+  - lenny
+  - auto
+  - maketank
+  - truhe
+  loop_control:
+    loop_var: mount_point
+
+
+
+# [Unit]
+# Description=Automount /backup/yori
+# After=network.target
+
+# [Automount]
+# Where=/backup/yori
+# TimeoutIdleSec=30
+
+# [Install]
+# WantedBy=network.target
+# [Unit]
+# Description=Mount /backup/yori
+# After=network.target
+# #Requires=backup-yori.automount
+# #After=backup-yori.automount
+
+# [Mount]
+# What=/dev/backup/yori
+# Where=/backup/yori
+# Type=btrfs
+# Options=defaults,compress=lzo,space_cache=v2
+
+# [Install]
+# WantedBy=network.target
\ No newline at end of file
diff --git a/roles/common/tasks/linux.yaml b/roles/common/tasks/linux.yaml
index 6430e8f..e8fe125 100644
--- a/roles/common/tasks/linux.yaml
+++ b/roles/common/tasks/linux.yaml
@@ -58,10 +58,6 @@
   include_role:
     name: sudo
 
-#- name: autofs for Linux
-#  include_role:
-#    name: autofs    
-#
 # Set vm.swappiness to 5 in /etc/sysctl.conf
 - sysctl:
     name: vm.swappiness
diff --git a/roles/file_server/tasks/main.yaml b/roles/file_server/tasks/main.yaml
new file mode 100644
index 0000000..eac7605
--- /dev/null
+++ b/roles/file_server/tasks/main.yaml
@@ -0,0 +1,31 @@
+
+- name: Generate Automounts
+  include_role: 
+    name: alysoid.ansible-systemd-mount
+  vars:
+    catena_mount:
+      - name: Mount {{ mount_point }}
+        options:
+          Mount:
+            What: /dev/vg01/{{ mount_point }}
+            Where: /srv/{{ mount_point }}
+            Type: btrfs
+            Options: defaults,compress=lzo,space_cache=v2
+          Unit:
+            After: network.target
+          Install:
+            WantedBy: network.target
+    catena_automount:
+      - name: Automount {{ mount_point }}
+        options:
+          Automount:
+            Where: /srv/{{ mount_point }}
+            TimeoutIdleSec: 90
+          Unit:
+            After: network.target
+          Install:
+            WantedBy: smb.service
+  loop:
+  - pub
+  loop_control:
+    loop_var: mount_point
\ No newline at end of file
diff --git a/site.yaml b/site.yaml
index 545dd44..bea16b2 100644
--- a/site.yaml
+++ b/site.yaml
@@ -7,61 +7,65 @@
 - hosts: auto02.chaos
   roles:
   - role: podman
+  - role: backup_server
+    tags: backup_server
+  - role: file_server
+    tags: file_server
   
-- hosts: pine01.wks
-  vars:
-    nomad_pool: sys
-  roles:
-  - role: nummer5
-    tags: nummer5
-  - role: armbian
-    tags: armbian
-  - role: debian
-    tags: debian
+# - hosts: pine01.wks
+#   vars:
+#     nomad_pool: sys
+#   roles:
+#   - role: nummer5
+#     tags: nummer5
+#   - role: armbian
+#     tags: armbian
+#   - role: debian
+#     tags: debian
 
-- hosts: pine02.wks
-  vars:
-    nomad_pool: apps
-  roles:
-  - role: nummer5
-    tags: nummer5
-  - role: armbian
-    tags: armbian
-  - role: debian
-    tags: debian
+# - hosts: pine02.wks
+#   vars:
+#     nomad_pool: apps
+#   roles:
+#   - role: nummer5
+#     tags: nummer5
+#   - role: armbian
+#     tags: armbian
+#   - role: debian
+#     tags: debian
     
-- hosts: pine03.wks
-  vars:
-    nomad_pool: apps
-  roles:
-  - role: nummer5
-    tags: nummer5
-  - role: armbian
-    tags: armbian
-  - role: debian
-    tags: debian
+# - hosts: pine03.wks
+#   vars:
+#     nomad_pool: apps
+#   roles:
+#   - role: nummer5
+#     tags: nummer5
+#   - role: armbian
+#     tags: armbian
+#   - role: debian
+#     tags: debian
     
-- hosts: pine04.wks
-  vars:
-    nomad_pool: apps
-  roles:
-  - role: nummer5
-    tags: nummer5
-  - role: armbian
-    tags: armbian
-  - role: debian
-    tags: debian
+# - hosts: pine04.wks
+#   vars:
+#     nomad_pool: apps
+#   roles:
+#   - role: nummer5
+#     tags: nummer5
+#   - role: armbian
+#     tags: armbian
+#   - role: debian
+#     tags: debian
     
-- hosts: pine05.wks
-  vars:
-    nomad_pool: sys
-  roles:
-  - role: nummer5
-    tags: nummer5
-  - role: armbian
-    tags: armbian
-  - role: debian
-    tags: debian
+# - hosts: pine05.wks
+#   vars:
+#     nomad_pool: sys
+#   roles:
+#   - role: nummer5
+#     tags: nummer5
+#   - role: armbian
+#     tags: armbian
+#   - role: debian
+#     tags: debian
       
 #- hosts: ~pine.*\.wks
 #  roles: