From 947131120ff71bc830cb489d6dcc8be184169268 Mon Sep 17 00:00:00 2001 From: Beth Parker Date: Mon, 7 Oct 2024 20:36:54 -0500 Subject: [PATCH 1/4] nfs mounts --- handlers/main.yml | 4 ++++ tasks/ext4.yml | 4 ++++ tasks/main.yml | 18 ++++++++++++++ tasks/main.yml.bak | 18 ++++++++++++++ tasks/nfs.yml | 59 ++++++++++++++++++++++++++++++++++++++++++++++ tasks/sshfs.yml | 4 ++++ templates/auto.nfs | 3 +++ vars/main.yml | 11 ++++++++- 8 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 tasks/ext4.yml create mode 100644 tasks/main.yml.bak create mode 100644 tasks/nfs.yml create mode 100644 tasks/sshfs.yml create mode 100644 templates/auto.nfs diff --git a/handlers/main.yml b/handlers/main.yml index fe36453..fec8258 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,2 +1,6 @@ --- # handlers file for mount +- name: restart autofs + service: + name: autofs + state: restarted diff --git a/tasks/ext4.yml b/tasks/ext4.yml new file mode 100644 index 0000000..e30c229 --- /dev/null +++ b/tasks/ext4.yml @@ -0,0 +1,4 @@ +- name: test + ansible.builtin.file: + path: /tmp/ext4-{{item.name}} + state: directory diff --git a/tasks/main.yml b/tasks/main.yml index 90b9b64..479289f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,2 +1,20 @@ --- # tasks file for mount + +- name: Set up mounts if variable is defined + block: +# - include_tasks: ext4.yml +# when: mounts.ext4 +# with_items: +# - mounts.ext4 + + - include_tasks: nfs.yml + when: mounts.nfs is defined + vars: + item: "{{ mounts.nfs }}" + +# - include_tasks: sshfs.yml +# loop: "{{ mounts }}" +# when: item == "sshfs" + + when: mounts is defined diff --git a/tasks/main.yml.bak b/tasks/main.yml.bak new file mode 100644 index 0000000..e83a39f --- /dev/null +++ b/tasks/main.yml.bak @@ -0,0 +1,18 @@ +--- +# tasks file for mount + +- name: Set up mounts if variable is defined + block: + - include_tasks: ext4.yml + loop: "{{ mounts }}" + when: item.type == "ext4" + + - include_tasks: nfs.yml + loop: "{{ mounts }}" + when: item.type == "nfs" + + - include_tasks: sshfs.yml + loop: "{{ mounts }}" + when: item.type == "sshfs" + + when: mounts is defined diff --git a/tasks/nfs.yml b/tasks/nfs.yml new file mode 100644 index 0000000..e3a304e --- /dev/null +++ b/tasks/nfs.yml @@ -0,0 +1,59 @@ +# tasks file for mounting nfs +- name: install autofs + ansible.builtin.package: + name: autofs + state: present + update_cache: true + +- name: install nfs-utils + ansible.builtin.package: + name: nfs-utils + state: present + +- name: ensure nfs is in auto.master + ansible.builtin.lineinfile: + path: /etc/autofs/auto.master + line: "/mnt/autofs/nfs /etc/autofs/auto.nfs" + state: present + create: true + notify: restart autofs + +- name: deploy auto.nfs file + ansible.builtin.template: + src: templates/auto.nfs + dest: /etc/autofs/auto.nfs + vars: + nfs: "{{ item }}" + notify: restart autofs + +- name: create symlinks + ansible.builtin.file: + src: "/mnt/autofs/nfs/{{ item.name }}" + dest: "{{ item.local }}" + state: link + loop: "{{ item }}" + +- name: ensure rpcbind is running + service: + name: rpcbind + state: started + enabled: yes + +- name: ensure nfs-client is running + service: + name: nfs-client.target + state: started + enabled: yes + +- name: ensure remote-fs is running + service: + name: remote-fs.target + state: started + enabled: yes + +- name: ensure autofs is running + service: + name: autofs + state: started + enabled: yes + diff --git a/tasks/sshfs.yml b/tasks/sshfs.yml new file mode 100644 index 0000000..d2fe6fb --- /dev/null +++ b/tasks/sshfs.yml @@ -0,0 +1,4 @@ +- name: test + ansible.builtin.file: + path: /tmp/sshfs-{{item.name}} + state: directory diff --git a/templates/auto.nfs b/templates/auto.nfs new file mode 100644 index 0000000..5940a6c --- /dev/null +++ b/templates/auto.nfs @@ -0,0 +1,3 @@ +{% for mount in nfs -%} +{{ mount.name }} -rw,soft,intr,rsize=8192,wsize=8192 {{ mount.host }}:{{ mount.remote }} +{%- endfor -%} diff --git a/vars/main.yml b/vars/main.yml index 4672f5e..5680450 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,2 +1,11 @@ --- -# vars file for mount +# vars file for mount on privtorrents.actcur.com + +mounts: + nfs: + - name: deluge + host: host.actcur.com + remote: /mnt/butter/video/deluge + local: /mnt/deluge + +# end of file From 806a3f6f01397093ec78027c0cb8d68bd7094923 Mon Sep 17 00:00:00 2001 From: Beth Date: Mon, 7 Oct 2024 22:06:55 -0500 Subject: [PATCH 2/4] update --- tasks/nfs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/nfs.yml b/tasks/nfs.yml index e3a304e..8427237 100644 --- a/tasks/nfs.yml +++ b/tasks/nfs.yml @@ -31,6 +31,7 @@ src: "/mnt/autofs/nfs/{{ item.name }}" dest: "{{ item.local }}" state: link + force: true loop: "{{ item }}" - name: ensure rpcbind is running From 4eda7f0cba6cd98eec7674036d2464fee8cf69ce Mon Sep 17 00:00:00 2001 From: Beth Date: Mon, 7 Oct 2024 22:13:31 -0500 Subject: [PATCH 3/4] update --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 479289f..701a016 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,7 +11,7 @@ - include_tasks: nfs.yml when: mounts.nfs is defined vars: - item: "{{ mounts.nfs }}" + nfs_mounts: "{{ mounts.nfs }}" # - include_tasks: sshfs.yml # loop: "{{ mounts }}" From 7cf3c512262af0c5573f31d369acd2de500612f6 Mon Sep 17 00:00:00 2001 From: Beth Date: Mon, 7 Oct 2024 22:14:44 -0500 Subject: [PATCH 4/4] update --- tasks/main.yml.bak | 18 ------------------ tasks/nfs.yml | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 tasks/main.yml.bak diff --git a/tasks/main.yml.bak b/tasks/main.yml.bak deleted file mode 100644 index e83a39f..0000000 --- a/tasks/main.yml.bak +++ /dev/null @@ -1,18 +0,0 @@ ---- -# tasks file for mount - -- name: Set up mounts if variable is defined - block: - - include_tasks: ext4.yml - loop: "{{ mounts }}" - when: item.type == "ext4" - - - include_tasks: nfs.yml - loop: "{{ mounts }}" - when: item.type == "nfs" - - - include_tasks: sshfs.yml - loop: "{{ mounts }}" - when: item.type == "sshfs" - - when: mounts is defined diff --git a/tasks/nfs.yml b/tasks/nfs.yml index 8427237..7162b0f 100644 --- a/tasks/nfs.yml +++ b/tasks/nfs.yml @@ -23,7 +23,7 @@ src: templates/auto.nfs dest: /etc/autofs/auto.nfs vars: - nfs: "{{ item }}" + nfs: "{{ nfs_mounts }}" notify: restart autofs - name: create symlinks @@ -32,7 +32,7 @@ dest: "{{ item.local }}" state: link force: true - loop: "{{ item }}" + loop: "{{ nfs_mounts }}" - name: ensure rpcbind is running service: