fix nginx proxy configuration conflicts (#3489)

* Allow configuration of nginx proxy config path

* Fix the internal nginx configuration location

Signed-off-by: Johann Queuniet <contact@lordran.net>
This commit is contained in:
Johann Queuniet
2018-10-11 15:33:18 +02:00
committed by k8s-ci-robot
parent 2117e8167d
commit 1911fe5ca8
4 changed files with 5 additions and 4 deletions

View File

@@ -6,7 +6,7 @@
- name: nginx-proxy | Make nginx directory
file:
path: /etc/nginx
path: "{{ nginx_config_dir }}"
state: directory
mode: 0700
owner: root
@@ -14,7 +14,7 @@
- name: nginx-proxy | Write nginx-proxy configuration
template:
src: nginx.conf.j2
dest: "/etc/nginx/nginx.conf"
dest: "{{ nginx_config_dir }}/nginx.conf"
owner: root
mode: 0755
backup: yes