Change HTML template parameters in line with similar parameters (#222)

Author: alessfg

CHANGELOG.md

@@ -23,6 +23,7 @@ BREAKING CHANGES:
   * Check [`defaults/main/template.yml`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/defaults/main/template.yml) and [`molecule/default/converge.yml`](https://github.com/nginxinc/ansible-role-nginx-config/blob/main/molecule/default/converge.yml) for examples!
   * These changes follow in the footsteps of the `http` Jinja2 refactor introduced in the `0.4.0` release. If you want more information on how to port your `stream` configurations, the release notes/changelog for `0.4.0` are a good place to start.
 * Replace `conf_file_name` and `conf_file_location` with `deployment_location` inside `nginx_config_stream_template`.
+* Replace `html_file_name` and `html_file_location` with `deployment_location` inside `nginx_config_html_demo_template`.
 
 FEATURES:
 

defaults/main/template.yml

@@ -3,8 +3,7 @@
 nginx_config_html_demo_template_enable: false
 nginx_config_html_demo_template:
   - template_file: www/index.html.j2
-    html_file_name: index.html
-    html_file_location: /usr/share/nginx/html
+    deployment_location: /usr/share/nginx/html/index.html
     web_server_name: Default
     backup: true
 

molecule/default/converge.yml

@@ -668,13 +668,11 @@
         nginx_config_html_demo_template_enable: true
         nginx_config_html_demo_template:
           - template_file: www/index.html.j2
-            html_file_name: frontend_index.html
-            html_file_location: /usr/share/nginx/html
+            deployment_location: /usr/share/nginx/html/frontend_index.html
             backup: true
             web_server_name: Frontend
           - template_file: www/index.html.j2
-            html_file_name: backend_index.html
-            html_file_location: /usr/share/nginx/html
+            deployment_location: /usr/share/nginx/html/backend_index.html
             backup: true
             web_server_name: Backend
 

molecule/plus/converge.yml

@@ -588,12 +588,10 @@
         nginx_config_html_demo_template_enable: true
         nginx_config_html_demo_template:
           - template_file: www/index.html.j2
-            html_file_name: frontend_index.html
-            html_file_location: /usr/share/nginx/html
+            deployment_location: /usr/share/nginx/html/frontend_index.html
             web_server_name: Frontend
           - template_file: www/index.html.j2
-            html_file_name: backend_index.html
-            html_file_location: /usr/share/nginx/html
+            deployment_location: /usr/share/nginx/html/backend_index.html
             web_server_name: Backend
 
         nginx_config_stream_template_enable: true

tasks/config/template-config.yml

@@ -1,7 +1,7 @@
 ---
 - name: Ensure HTML directory exists
   file:
-    path: "{{ item.html_file_location | default('/usr/share/nginx/html') }}"
+    path: "{{ item.deployment_location | default('/usr/share/nginx/html') | dirname }}"
     state: directory
     mode: 0755
   loop: "{{ nginx_config_html_demo_template }}"
@@ -10,7 +10,7 @@
 - name: Dynamically generate HTML files
   template:
     src: "{{ item.template_file | default('www/index.html.j2') }}"
-    dest: "{{ item.html_file_location | default('/usr/share/nginx/html') }}/{{ item.html_file_name | default('index.html') }}"
+    dest: "{{ item.deployment_location | default('/usr/share/nginx/html/index.html') }}"
     backup: "{{ item.backup  | default(true) }}"
     mode: 0644
   loop: "{{ nginx_config_html_demo_template }}"