From f5320913a40798882f42665613f9d1db22736497 Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Mon, 28 Jun 2021 17:14:24 -0500
Subject: [PATCH] nginx softcoding2

---
 roles/nginx/tasks/install.yml       | 8 +++++++-
 roles/nginx/templates/nginx.conf.j2 | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index 020a3881c..8f76d98df 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -40,8 +40,14 @@
 
 - name: Insure alternate nginx path is present
   file:
+    path: "{{ item }}"
     state: directory
-    path: "{{ nginx_conf_dir }}"
+  with_items:
+    - "{{ nginx_conf_dir }}"
+    - "{{ nginx_dir }}/modules-available"
+    - "{{ nginx_dir }}/modules-enabled"
+    - "{{ nginx_dir }}/sites-available"
+    - "{{ nginx_dir }}/sites-enabled"
 
 - name: Remove NGINX default config /etc/nginx/sites-enabled/default
   file:
diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index 5e440a9ff..8f94b7426 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -5,7 +5,7 @@
 user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
-include /etc/nginx/modules-enabled/*.conf;
+include {{ nginx_dir }}/modules-enabled/*.conf;
 
 events {
     worker_connections 768;
@@ -29,7 +29,7 @@ http {
     server_names_hash_bucket_size 64;
     # server_name_in_redirect off;
 
-    include /etc/nginx/mime.types;
+    include {{ nginx_dir }}/mime.types;
     default_type text/html;
 
     ##
@@ -91,10 +91,10 @@ http {
     ##
 
     # include a server file which in turn includes conf.d/*
-    include /etc/nginx/server.conf;
+    include {{ nginx_dir }}/server.conf;
 
     # include other sites
-    include /etc/nginx/sites-enabled/*.conf;
+    include {{ nginx_dir }}/sites-enabled/*.conf;
 
     # define the upstream backend fastcgi for php
     upstream php {