Merge pull request #24 from nginxinc/(bug)/merge-config-upload-variable

Replace *_upload_enable with *_push_enable

tasks/conf/push-config.yml

@@ -2,7 +2,7 @@
 - name: "(Setup: All NGINX) Check NGINX Default Configuration File Exists"
   stat:
     path: /etc/nginx/conf.d/default.conf
-  when: main_upload_enable
+  when: main_push_enable
   register: default_exists
 
 - name: "(Setup: All NGINX) Backup NGINX Default Configuration File"
@@ -10,26 +10,26 @@
     remote_src: yes
     src: /etc/nginx/conf.d/default.conf
     dest: /etc/nginx/conf.d/default.conf.bak
-  when: default_exists.stat.exists and main_upload_enable
+  when: default_exists.stat.exists and main_push_enable
 
 - name: "(Setup: All NGINX) Delete NGINX Default Configuration File"
   file:
     path: /etc/nginx/conf.d/default.conf
     state: absent
-  when: default_exists.stat.exists and main_upload_enable
+  when: default_exists.stat.exists and main_push_enable
 
 - name: "(Setup: All NGINX) Upload NGINX Main Configuration File"
   copy:
     src: "{{ main_upload_location }}"
     dest: /etc/nginx/nginx.conf
   notify: "(Handler: All OSs) Reload NGINX"
-  when: main_upload_enable
+  when: main_push_enable
 
 - name: "(Setup: All NGINX) Ensure NGINX HTTP Directory Exists"
   file:
     path: /etc/nginx/conf.d/http
     state: directory
-  when: http_template_enable
+  when: http_push_enable
 
 - name: "(Setup: All NGINX) Upload NGINX HTTP Configuration Files"
   copy:
@@ -38,13 +38,13 @@
   with_fileglob:
     - "{{ http_upload_location }}"
   notify: "(Handler: All OSs) Reload NGINX"
-  when: http_upload_enable
+  when: http_push_enablee
 
 - name: "(Setup: All NGINX) Ensure NGINX Stream Directory Exists"
   file:
     path: /etc/nginx/conf.d/stream
     state: directory
-  when: stream_template_enable
+  when: stream_push_enable
 
 - name: "(Setup: All NGINX) Upload NGINX Stream Configuration Files"
   copy:
@@ -53,4 +53,4 @@
   with_fileglob:
     - "{{ stream_upload_location }}"
   notify: "(Handler: All OSs) Reload NGINX"
-  when: stream_upload_enable
+  when: stream_push_enable