External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from geerlingguy/installer-whitespace-cleanup

Browse Source 
Whitespace cleanup for installer.
This commit is contained in:
Matthew Jones
2017-09-07 17:23:42 -07:00
committed by GitHub
parent 33c0f8c721 6abffcb1df
commit 534fefd82f
7 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/check_vars/tasks/check_docker.yml
View File

@@ -12,4 +12,3 @@
that: that:
- host_port is defined and host_port != '' - host_port is defined and host_port != ''
msg: "Set the value of 'host_port' in the inventory file." msg: "Set the value of 'host_port' in the inventory file."

2
installer/check_vars/tasks/main.yml
View File

@@ -1,9 +1,7 @@
# main.yml # main.yml
--- ---
- include: check_openshift.yml - include: check_openshift.yml
when: openshift_host is defined and openshift_host != '' when: openshift_host is defined and openshift_host != ''
- include: check_docker.yml - include: check_docker.yml
when: openshift_host is not defined or openshift_host == '' when: openshift_host is not defined or openshift_host == ''

1
installer/image_build/files/nginx.conf
View File

@@ -28,7 +28,6 @@ http {
#tcp_nopush on; #tcp_nopush on;
#gzip on; #gzip on;
upstream uwsgi { upstream uwsgi {
server localhost:8050; server localhost:8050;
} }

1
installer/image_build/tasks/main.yml
View File

@@ -1,5 +1,4 @@
--- ---
- name: Get Version from checkout if not provided - name: Get Version from checkout if not provided
shell: "git describe --long | sed 's/\\-g.*//' | sed 's/\\-/\\./'" shell: "git describe --long | sed 's/\\-g.*//' | sed 's/\\-/\\./'"
delegate_to: localhost delegate_to: localhost