From aae6e9c84a901b4236c0aa6bb1bfc0839d83ed20 Mon Sep 17 00:00:00 2001
From: Alicia Cozine <acozine@users.noreply.github.com>
Date: Thu, 5 Oct 2023 18:32:30 -0500
Subject: [PATCH] only remove static site config files, move slash out of var
 def

---
 roles/nginxplus/README.md                     | 2 +-
 roles/nginxplus/defaults/main.yml             | 5 ++---
 roles/nginxplus/tasks/conf/cleanup-config.yml | 2 +-
 roles/nginxplus/tasks/conf/upload-config.yml  | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roles/nginxplus/README.md b/roles/nginxplus/README.md
index 8946773d06..5127b24dd3 100644
--- a/roles/nginxplus/README.md
+++ b/roles/nginxplus/README.md
@@ -159,7 +159,7 @@ nginx_main_upload_dest: /etc/nginx/
 # Upload HTTP NGINX configuration files.
 nginx_http_upload_enable: false
 nginx_http_upload_src: conf/http/*.conf
-nginx_http_upload_dest: /etc/nginx/conf.d/
+nginx_http_upload_dest: /etc/nginx/conf.d
 # Upload Stream NGINX configuration files.
 nginx_stream_upload_enable: false
 nginx_stream_upload_src: conf/stream/*.conf
diff --git a/roles/nginxplus/defaults/main.yml b/roles/nginxplus/defaults/main.yml
index e51c1ffff5..9c35e7ad11 100644
--- a/roles/nginxplus/defaults/main.yml
+++ b/roles/nginxplus/defaults/main.yml
@@ -100,8 +100,7 @@ nginx_unit_modules: null
 # Use a list of paths you wish to remove.
 # Default is false.
 nginx_cleanup_config: false
-nginx_cleanup_config_path:
-  - /etc/nginx/conf.d
+nginx_cleanup_config_path: "{{nginx_http_upload_dest}}/static/"
 
 # add template files for library production and staging
 nginx_template_upload_enable: false
@@ -117,7 +116,7 @@ nginx_main_upload_dest: /etc/nginx/
 # Upload HTTP NGINX configuration files.
 nginx_http_upload_enable: false
 nginx_http_upload_src: conf/http/*.conf
-nginx_http_upload_dest: /etc/nginx/conf.d/
+nginx_http_upload_dest: /etc/nginx/conf.d
 # Upload Stream NGINX configuration files.
 nginx_stream_upload_enable: false
 nginx_stream_upload_src: conf/stream/*.conf
diff --git a/roles/nginxplus/tasks/conf/cleanup-config.yml b/roles/nginxplus/tasks/conf/cleanup-config.yml
index 5222942689..6dca3037cb 100644
--- a/roles/nginxplus/tasks/conf/cleanup-config.yml
+++ b/roles/nginxplus/tasks/conf/cleanup-config.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Setup: Remove NGINX configuration files"
+- name: "Setup: Remove NGINX static site config files"
   file:
     path: "{{ item }}"
     state: absent
diff --git a/roles/nginxplus/tasks/conf/upload-config.yml b/roles/nginxplus/tasks/conf/upload-config.yml
index e101633a9a..49eef6c806 100644
--- a/roles/nginxplus/tasks/conf/upload-config.yml
+++ b/roles/nginxplus/tasks/conf/upload-config.yml
@@ -27,7 +27,7 @@
     src: "{{ item }}"
     # test path:
     dest: "/tmp/static/"
-    # dest: "{{ nginx_http_upload_dest }}static/"
+    # dest: "{{ nginx_http_upload_dest }}/static/"
     mode: 0755
     backup: true
   with_fileglob: "{{ nginx_http_upload_src }}"