From 48208c520bb15d16b0eab623b97fa5e86c6f665c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Gon=C3=A7alves?= <me@rgoncalves.se>
Date: Sat, 11 Dec 2021 13:53:42 +0000
Subject: roles/httpd_pre: Switch for NFS and common defaults
---
roles/httpd/defaults/main.yml | 1 -
roles/httpd_pre/defaults/main.yml | 1 +
roles/httpd_pre/tasks/main.yml | 10 +++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
create mode 120000 roles/httpd_pre/defaults/main.yml
(limited to 'roles')
diff --git a/roles/httpd/defaults/main.yml b/roles/httpd/defaults/main.yml
index 9ccd2f3..e09e3cd 100644
--- a/roles/httpd/defaults/main.yml
+++ b/roles/httpd/defaults/main.yml
@@ -1,4 +1,3 @@
httpd_configuration_file: /etc/httpd.conf
httpd_configuration_dir: /etc/httpd.d
httpd_chroot: /var/www
-httpd_use_nfs: false
diff --git a/roles/httpd_pre/defaults/main.yml b/roles/httpd_pre/defaults/main.yml
new file mode 120000
index 0000000..52d65d9
--- /dev/null
+++ b/roles/httpd_pre/defaults/main.yml
@@ -0,0 +1 @@
+../../httpd/defaults/main.yml
\ No newline at end of file
diff --git a/roles/httpd_pre/tasks/main.yml b/roles/httpd_pre/tasks/main.yml
index 83afb91..0209a84 100644
--- a/roles/httpd_pre/tasks/main.yml
+++ b/roles/httpd_pre/tasks/main.yml
@@ -1,6 +1,3 @@
-- name: include httpd role variables
- include_vars: "{{ inventory_dir }}/roles/httpd/defaults/main.yml"
-
- name: create httpd directory
file:
path: /etc/httpd.d
@@ -16,3 +13,10 @@
owner: "www"
group: "www"
mode: 0700
+
+- name: mount nfs in chroot
+ include_role:
+ name: nfsclient
+ vars:
+ nfsclient_dir: "{{ httpd_chroot }}/data"
+ when: httpd_use_nfs
--
cgit v1.2.3