radityo/ansible-nginx
1
0
Fork 0
mirror of https://github.com/HanXHX/ansible-nginx.git synced 2026-02-24 09:03:29 +07:00
Code Issues Projects Releases Wiki Activity

New feature: provide location order (#24 related)

Browse Source
This commit is contained in:
Emilien Mantel
2016-11-23 11:43:13 +01:00
parent de71e1bdcc
commit 5b0977567c
4 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/etc/nginx/sites-available/_base.j2
View File

@@ -5,6 +5,7 @@
{% set __location = item.location | default({}) %}
{% set __headers = item.headers | default({'X-Frame-Options': 'DENY always', 'X-Content-Type-Options': 'nosniff always' }) %}
{% set __ssl_name = item.ssl_name | default(item.name if item.name is string else item.name[0]) %}
{% set __location_order = item.location_order | default(__location.keys()) %}
{% macro htpasswd(htpasswd_name, indent=1) -%}
{% for ht in nginx_htpasswd if ht.name == htpasswd_name %}
{{ "\t" * indent }}auth_basic "{{ ht.description }}";
@@ -84,10 +85,11 @@ server {
{% block template_custom_location %}
{% endblock %}
{% if __location is iterable and __location | length > 0 %}
{% if __location_order | length > 0 %}
# --> Custom locations
{% for location, opts in __location.iteritems() %}
{% for location in __location_order %}
location {{ location }} {
{% set opts = __location[location] %}
{% for opt in opts %}
{% if opt.htpasswd is defined %}{{ htpasswd(opt.htpasswd, 2) }}{% else %}
{{ opt }}