Apps vhosts should without root and created dirs

pull/14/head
Emilien Mantel 2016-01-22 09:46:43 +01:00
parent 7f56db76e0
commit dd97e5ec79
4 changed files with 8 additions and 3 deletions

View File

@ -23,7 +23,7 @@
with_items: nginx_vhosts with_items: nginx_vhosts
when: > when: >
item.root is not defined and item.root is not defined and
(item.template is defined and item.template != '_proxy') and (item.template is defined and item.template not in nginx_templates_no_dir) and
(item.delete is not defined or not item.delete) and (item.delete is not defined or not item.delete) and
item.redirect_to is not defined item.redirect_to is not defined
@ -37,7 +37,7 @@
with_items: nginx_vhosts with_items: nginx_vhosts
when: > when: >
item.root is not defined and item.root is not defined and
(item.template is defined and item.template != '_proxy') and (item.template is defined and item.template not in nginx_templates_no_dir) and
(item.delete is not defined or not item.delete) and (item.delete is not defined or not item.delete) and
item.redirect_to is not defined item.redirect_to is not defined

View File

@ -13,7 +13,7 @@
{% block template_local_content %} {% block template_local_content %}
location ~ /\.ht { location ~ /\.ht {
deny all; deny all;
} }
location /backuppc/image { location /backuppc/image {

View File

@ -4,6 +4,7 @@
{% if item.root is defined %} {% if item.root is defined %}
root {{ item.root }}; root {{ item.root }};
{% endif %} {% endif %}
{% endblock %}
{% block template_try_files %} {% block template_try_files %}
include /etc/nginx/proxy_params; include /etc/nginx/proxy_params;

View File

@ -27,3 +27,7 @@ nginx_dirs:
- "{{ nginx_ssl_dir }}" - "{{ nginx_ssl_dir }}"
- "{{ nginx_helper_dir }}" - "{{ nginx_helper_dir }}"
nginx_templates_no_dir:
- '_proxy'
- '_nagios3'
- '_backuppc'