only remove static site config files, move slash out of var def

pulibrary · Oct 5, 2023 · aae6e9c · aae6e9c
1 parent 243fce1
commit aae6e9c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 }}"