roles/nfsd: Consistent configuration with other roles

4 files changed, 22 insertions, 19 deletions

diff --git a/roles/nfsd/defaults/main.yml b/roles/nfsd/defaults/main.yml
index 1478e25..b214a7c 100644
--- a/roles/nfsd/defaults/main.yml
+++ b/roles/nfsd/defaults/main.yml
@@ -1,4 +1,4 @@
-nfsd_data_dir: /data/nfs
+nfsd_dir: /data/nfs
+nfsd_shared_dirs: "{{ vmm_vms | map(attribute='name') | list }}"
 nfsd_configuration_file: /etc/exports
 nfsd_processes: 10
-nfsd_shared_dirs: "{{ vmm_vms | map(attribute='name') | list }}"
diff --git a/roles/nfsd/tasks/main.yml b/roles/nfsd/tasks/main.yml
index 7be5f2a..a8cabcf 100644
--- a/roles/nfsd/tasks/main.yml
+++ b/roles/nfsd/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: create nfsd data directory
   file:
-    path: "{{ nfsd_data_dir }}"
+    path: "{{ nfsd_dir }}"
     owner: 0
     group: 0
     mode: 0700
@@ -8,7 +8,7 @@
 
 - name: create hosts directories
   file:
-    path: "{{ nfsd_data_dir }}/{{ item }}"
+    path: "{{ nfsd_dir }}/{{ item }}"
     owner: 0
     group: 0
     mode: 0777
@@ -19,17 +19,25 @@
   template:
     src: exports.j2
     dest: /etc/exports
-    owner: root
+    owner: 0
+    group: 0
     mode: 0640
   register: result
 
-- name: enable and start nfsd service
-  service: &nfsd_service
-    name: nfsd
-    state: "{{ 'restarted' if result.changed else 'started' }}"
+- name: enable and restart portmap
+  service: &enable_and_restart
+    name: portmap
+    state: restarted
     enabled: true
 
-- name: enable and restart mountd
+- name: enable and reload/restart mountd
   service:
-    <<: *nfsd_service
+    <<: *enable_and_restart
     name: mountd
+    state: reloaded
+
+- name: enable and restart nfsd
+  service:
+    <<: *enable_and_restart
+    name: nfsd
+    state: restarted
diff --git a/roles/nfsd/tasks/_freebsd.yml b/roles/nfsd/tasks/os_freebsd.yml
index 2cae34a..2a8a8cd 100644
--- a/roles/nfsd/tasks/_freebsd.yml
+++ b/roles/nfsd/tasks/os_freebsd.yml
@@ -1,9 +1,4 @@
-
-# nfsd ~~ roles/nfsd/tasks/_freebsd.yml
-
----
-
-- name: ensure daemons flag
+- name: edit daemons flags
   lineinfile:
     path: /etc/rc.conf
     regexp: "^{{ item[0] }}="
@@ -13,7 +8,7 @@
     - ["rpcbind_enable=", "YES"]
     - ["mountd_flags", "-r"]
 
-- name: ensure rpcbind is enabled and restarted
+- name: enable and restart rpcbind
   service:
     name: rpcbind
     state: restarted
diff --git a/roles/nfsd/templates/exports.j2 b/roles/nfsd/templates/exports.j2
index 78ee61f..c579fed 100644
--- a/roles/nfsd/templates/exports.j2
+++ b/roles/nfsd/templates/exports.j2
@@ -3,6 +3,6 @@
 {% for host in groups.servers %}
 {% if host in nfsd_shared_dirs %}
 {% set h = hostvars[host] %}
-{{ nfsd_data_dir }}/{{ h.inventory_hostname }} -maproot=root {{ h.__ip.internal if h.__ip.internal is defined }} {{ h.__ip.external if h.__ip.external is defined }}
+{{ nfsd_dir }}/{{ h.inventory_hostname }} -maproot=root {{ h.__ip.internal if h.__ip.internal is defined }} {{ h.__ip.external if h.__ip.external is defined }}
 {% endif %}
 {% endfor %}