diff --git a/defaults/main.yml b/defaults/main.yml index 5a0371a..d3c6b3b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -103,10 +103,6 @@ nginx_logrotate_maxfilesize: "1G" nginx_logrotate_retention: "52" nginx_use_common_virthost: False -nginx_upstream_backends: [] -# - name: unicorn -# servers: -# - 127.0.0.1:4000 fail_timeout=0 # # Virtualhost example nginx_virthosts: [] @@ -115,6 +111,10 @@ nginx_virthosts: [] # server_name: '{{ ansible_fqdn }}' # server_aliases: '' # index: index.html +# upstream_backends: +# - name: unicorn +# servers: +# - 127.0.0.1:4000 fail_timeout=0 # error_page: /path_to_error_page.html # ssl_enabled: False # ssl_only: False diff --git a/templates/nginx-virthost.j2 b/templates/nginx-virthost.j2 index ec59288..ce5a5db 100644 --- a/templates/nginx-virthost.j2 +++ b/templates/nginx-virthost.j2 @@ -6,14 +6,16 @@ include /etc/nginx/snippets/nginx-websockets.conf; {% endif %} {% endif %} -{% for u_bk in nginx_upstream_backends %} +{% if item.upstream_backends is defined %} +{% for u_bk in item.upstream_backends %} upstream {{ u_bk.name }} { {% for srv in u_bk.servers %} - server {{ u_bk.srv }}; + server {{ srv }}; {% endfor %} } {% endfor %} +{% endif %} server { listen {{ item.http_port | default ('80') }}; server_name {{ item.server_name }} {% if item.serveraliases is defined %}{{ item.serveraliases }}{% endif %};