sebclem/ansible-role-nginx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Replace *_upload_enable with *_push_enable
This commit is contained in:
Alessandro Fael Garcia 2018-04-16 15:40:26 -07:00 committed by GitHub
commit a8aeee176f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasks/conf/push-config.yml
View File

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