From 84c1c598cd8fdfa9bef73bd642de4bfe79364cf7 Mon Sep 17 00:00:00 2001 From: jaydee Date: Sun, 17 May 2026 11:32:07 +0200 Subject: [PATCH] build --- roles/autofs/tasks/main.yml | 44 ++++++++++++++++----------------- roles/nfs_server/tasks/main.yml | 10 +++----- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/roles/autofs/tasks/main.yml b/roles/autofs/tasks/main.yml index d51969e..4773ccf 100755 --- a/roles/autofs/tasks/main.yml +++ b/roles/autofs/tasks/main.yml @@ -24,11 +24,11 @@ ansible.builtin.copy: dest: "/etc/auto.m-server" content: | - docker_data -fstype=nfs m-server.home.lan:/docker_data - downloads -fstype=nfs m-server.home.lan:/downloads - movies -fstype=nfs m-server.home.lan:/movies - shows -fstype=nfs m-server.home.lan:/shows - music -fstype=nfs m-server.home.lan:/music + docker_data -fstype=nfs m-server.home.lan:/docker_data + downloads -fstype=nfs m-server.home.lan:/downloads + movies -fstype=nfs m-server.home.lan:/movies + shows -fstype=nfs m-server.home.lan:/shows + music -fstype=nfs m-server.home.lan:/music mode: '0600' owner: root group: root @@ -142,18 +142,18 @@ ansible.builtin.copy: dest: "/etc/auto.nas" content: | - docker-data --fstype=nfs,rw nas.home.lan:/docker_data - data --fstype=nfs,rw nas.home.lan:/Data - qda_1 --fstype=nfs,rw nas.home.lan:/qda_1 - photo --fstype=nfs,rw nas.home.lan:/Photo - install --fstype=nfs,rw nas.home.lan:/install - games --fstype=nfs,rw nas.home.lan:/games - movies --fstype=nfs,rw nas.home.lan:/movies - music --fstype=nfs,rw nas.home.lan:/music - shows --fstype=nfs,rw nas.home.lan:/shows - xxx --fstype=nfs,rw nas.home.lan:/xxx - proxmox --fstype=nfs,rw nas.home.lan:/proxmox - live --fstype=nfs,rw nas.home.lan:/live + docker_data -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/docker_data + data -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/Data + qda_1 -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/qda_1 + photo -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/Photo + install -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/install + games -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/games + movies -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/movies + music -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/music + shows -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/shows + xxx -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/xxx + proxmox -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/proxmox + live -fstype=nfs4,rw,soft,intr,timeo=5,retrans=2 nas.home.lan:/live mode: '0600' owner: root group: root @@ -187,30 +187,30 @@ ansible.builtin.lineinfile: path: /etc/auto.master regexp: "^/media/nas.*" - line: /media/nas /etc/auto.nas --timeout 360 --ghost + line: /mnt/nas /etc/auto.nas --timeout 60 - name: Reconfigure autofs Server ansible.builtin.lineinfile: path: /etc/auto.master regexp: "^/media/m-server.*" - line: /media/m-server /etc/auto.m-server --timeout 360 --ghost + line: /mnt/m-server /etc/auto.m-server --timeout 60 - name: Reconfigure autofs Server ansible.builtin.lineinfile: path: /etc/auto.master regexp: "^/media/rack.*" - line: /media/rack /etc/auto.rack --timeout 360 --ghost + line: /mnt/rack /etc/auto.rack --timeout 60 - name: Reconfigure autofs Server ansible.builtin.lineinfile: path: /etc/auto.master regexp: "^/media/rpi5.*" - line: /media/rpi5 /etc/auto.rpi5 --timeout 360 --ghost + line: /mnt/rpi5 /etc/auto.rpi5 --timeout 60 - name: Reconfigure autofs Server ansible.builtin.lineinfile: path: /etc/auto.master regexp: "^/media/amd.*" - line: /media/amd /etc/auto.amd --timeout 360 --ghost + line: /mnt/amd /etc/auto.amd --timeout 60 - name: Restart docker service ansible.builtin.service: diff --git a/roles/nfs_server/tasks/main.yml b/roles/nfs_server/tasks/main.yml index b283b1f..1baa916 100755 --- a/roles/nfs_server/tasks/main.yml +++ b/roles/nfs_server/tasks/main.yml @@ -77,20 +77,20 @@ ansible.builtin.lineinfile: path: /etc/exports regexp: "^/srv/nfs .*" - line: "/srv/nfs 192.168.77.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0) 192.168.80.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0)" + line: "/srv/nfs 192.168.0.0/16(rw,sync,no_subtree_check,crossmnt,fsid=0)" - name: Reconfigure nfs exports ansible.builtin.lineinfile: path: /etc/exports regexp: "^/srv/nfs/docker_data .*" - line: "/srv/nfs/docker_data 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)" + line: "/srv/nfs/docker_data 192.168.0.0/16(rw,sync,no_subtree_check)" when: inventory_hostname != 'amd.home.lan' - name: Reconfigure nfs exports ansible.builtin.lineinfile: path: /etc/exports regexp: "^/srv/nfs/{{ volume }} .*" - line: "/srv/nfs/{{ volume }} 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)" + line: "/srv/nfs/{{ volume }} 192.168.0.0/16(rw,sync,no_subtree_check)" when: inventory_hostname == 'm-server.home.lan' loop_control: loop_var: volume @@ -100,13 +100,11 @@ - movies - shows - - - name: Reconfigure nfs exports ansible.builtin.lineinfile: path: /etc/exports regexp: "^/srv/nfs/backup .*" - line: "/srv/nfs/backup 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)" + line: "/srv/nfs/backup 192.168.0.0/16(rw,sync,no_subtree_check)" when: inventory_hostname == 'amd.home.lan' - name: Restart nfs service ansible.builtin.service: