From 2515ab82db53b16ccc89ee25f4f903ef4d7eb170 Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Sat, 23 May 2020 11:13:34 +0200
Subject: [PATCH] roles/nfs: Improved var usages

- Extracted global_nfs_directory from default root_directory
- Added usage of export_path
---
 group_vars/all/vars.yml                   | 1 +
 roles/nfs/export/defaults/main.yml        | 2 +-
 roles/nfs/export/templates/export.exports | 2 +-
 roles/nfs/server/defaults/main.yml        | 2 --
 roles/nfs/server/tasks/main.yml           | 2 +-
 roles/nfs/server/templates/root.exports   | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 0372713..7664d4f 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -71,6 +71,7 @@ global_ip_discover_register_pass: "{{ lookup('password', 'credentials/ip_discove
 global_interfaces_directory: "/etc/network/interfaces.d"
 
 global_nfs_port: "2049" # for version 4
+global_nfs_directory: "{{ global_webservers_directory }}/nfs"
 
 global_pamd: "/etc/pam.d"
 
diff --git a/roles/nfs/export/defaults/main.yml b/roles/nfs/export/defaults/main.yml
index 91a87b6..f6953ee 100644
--- a/roles/nfs/export/defaults/main.yml
+++ b/roles/nfs/export/defaults/main.yml
@@ -2,7 +2,7 @@
 
 export_name: "{{ real_path | basename }}"
 # real_path: "/exported/path"
-export_path: "{{ root_directory }}/{{ export_name }}"
+export_path: "{{ global_nfs_directory }}/{{ export_name }}"
 export_config_name: "{{ export_name | regex_replace('/', '-') }}"
 mount_unit_name: "{{ export_path | regex_replace('^/') | regex_replace('/', '-') }}.mount"
 
diff --git a/roles/nfs/export/templates/export.exports b/roles/nfs/export/templates/export.exports
index 27d6bfb..822d974 100644
--- a/roles/nfs/export/templates/export.exports
+++ b/roles/nfs/export/templates/export.exports
@@ -1,4 +1,4 @@
-{{ root_directory }}/{{ export_name }} {% for host in export_hosts -%}
+{{ export_path }} {% for host in export_hosts -%}
   {{ host }}({{ readonly | ternary('ro', 'rw') }},sync
   {%- if squash_user != "" -%}
     ,all_squash,anonuid={{ user_info.uid }},anongid={{ user_info.group }}
diff --git a/roles/nfs/server/defaults/main.yml b/roles/nfs/server/defaults/main.yml
index 06fb5a0..331c41c 100644
--- a/roles/nfs/server/defaults/main.yml
+++ b/roles/nfs/server/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
 
-root_directory: "{{ global_webservers_directory }}/nfs"
-
 exports_config: "/etc/exports"
 exports_config_directory: "/etc/exports.d"
diff --git a/roles/nfs/server/tasks/main.yml b/roles/nfs/server/tasks/main.yml
index a6f6ad5..27bb72b 100644
--- a/roles/nfs/server/tasks/main.yml
+++ b/roles/nfs/server/tasks/main.yml
@@ -9,7 +9,7 @@
 - name: Create exports root directory
   file:
     state: directory
-    path: "{{ root_directory }}"
+    path: "{{ global_nfs_directory }}"
     owner: root
     group: root
     mode: u=rwx,g=rx,o=rx
diff --git a/roles/nfs/server/templates/root.exports b/roles/nfs/server/templates/root.exports
index d6fc3f6..0b9b90b 100644
--- a/roles/nfs/server/templates/root.exports
+++ b/roles/nfs/server/templates/root.exports
@@ -1 +1 @@
-{{ root_directory }} *(ro,sync,all_squash,no_subtree_check,fsid=root)
+{{ global_nfs_directory }} *(ro,sync,all_squash,no_subtree_check,fsid=root)