From 00bfc3845ddebb29a8e0fc19eea95d06f47b991c Mon Sep 17 00:00:00 2001 From: Mauro Torrez Date: Wed, 2 Oct 2019 09:41:26 -0300 Subject: [PATCH] new nginx configuration --- tasks/main.yml | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 010880e..501f04c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -52,32 +52,21 @@ # details) WORDPRESS_CONFIG_EXTRA: "{{ wordpress_config_extra }}" networks: - - name: "{{ docker_network_name }}" + - name: "{{ docker_network }}" ports: -- name: template nginx config - copy: - content: | - server { - listen 80; # para debug - listen 443 ssl; - server_name {{ wordpress_domain }}; - - location {{ wordpress_web_root }} { - proxy_pass http://{{ wordpress_container }}:8080; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } - dest: "{{ nginx_config_mountpoint }}/wordpress.conf" - register: ngconf - -- name: restart frontend - docker_container: - name: "{{ nginx_container_name }}" - restart: yes - when: ngconf is changed +- name: export nginx config + set_fact: + nginx_config: >- + {{ nginx_config | default({}) | combine({ + wordpress_domain: { + "locations": { + wordpress_web_root.rstrip('/')+'/': { + "proxy_pass": "http://{}:8080/".format(wordpress_container) + } + } + } + }) }} - name: inspect wordpress volume docker_volume_info: