Skip to content

Commit 0c5c5d7

Browse files
alessfgalessfg
authored
Tweak inconsistent types (#63)
1 parent c6a2e7b commit 0c5c5d7

File tree

4 files changed

+49
-48
lines changed

4 files changed

+49
-48
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ ENHANCEMENTS:
1818

1919
BUG FIXES:
2020

21-
Fix edge case where `proxy_pass` is still required when using `grpc_pass`.
21+
* Address inconsistent types within Jinja templates.
22+
* Fix edge case where `proxy_pass` is still required when using `grpc_pass`.
2223

2324
## 0.3.2 (January 11, 2021)
2425

‎templates/http/default.conf.j2

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{{ ansible_managed | comment }}
22

3-
{% if item.value.upstreams is defined and item.value.upstreams %}
3+
{% if item.value.upstreams is defined %}
44
{% for upstream in item.value.upstreams %}
55
upstream {{ item.value.upstreams[upstream].name }} {
66
{% if item.value.upstreams[upstream].lb_method is defined and item.value.upstreams[upstream].lb_method | length %}
77
{{ item.value.upstreams[upstream].lb_method }};
88
{% endif %}
9-
{% if item.value.upstreams[upstream].zone_name is defined and item.value.upstreams[upstream].zone_name %}
9+
{% if item.value.upstreams[upstream].zone_name is defined and item.value.upstreams[upstream].zone_size is defined %}
1010
zone {{ item.value.upstreams[upstream].zone_name }} {{ item.value.upstreams[upstream].zone_size }};
1111
{% endif %}
1212
{% for server in item.value.upstreams[upstream].servers %}
@@ -24,32 +24,32 @@ upstream {{ item.value.upstreams[upstream].name }} {
2424
{% endfor %}
2525
{% endif %}
2626

27-
{% if item.value.proxy_cache is defined and item.value.proxy_cache %}
28-
{% if item.value.proxy_cache.proxy_cache_path is defined and item.value.proxy_cache.proxy_cache_path %}
27+
{% if item.value.proxy_cache is defined %}
28+
{% if item.value.proxy_cache.proxy_cache_path is defined %}
2929
{% for proxy_cache_path in item.value.proxy_cache.proxy_cache_path %}
3030
proxy_cache_path {{ proxy_cache_path.path }} keys_zone={{ proxy_cache_path.keys_zone.name }}:{{ proxy_cache_path.keys_zone.size }}
3131
levels={{ proxy_cache_path.levels }} max_size={{ proxy_cache_path.max_size }}
3232
inactive={{ proxy_cache_path.inactive }} use_temp_path={{ proxy_cache_path.use_temp_path | ternary("on", "off") }};
3333
{% endfor %}
34-
{% if item.value.proxy_cache.proxy_cache_background_update is defined and item.value.proxy_cache.proxy_cache_background_update%}
34+
{% if item.value.proxy_cache.proxy_cache_background_update is defined and item.value.proxy_cache.proxy_cache_background_update %}
3535
proxy_cache_background_update {{ item.value.proxy_cache.proxy_cache_background_update | ternary("on", "off") }};
3636
{% endif %}
3737
{% if item.value.proxy_cache.proxy_cache_lock is defined and item.value.proxy_cache.proxy_cache_lock %}
3838
proxy_cache_lock {{ item.value.proxy_cache.proxy_cache_lock | ternary("on", "off") }};
3939
{% endif %}
40-
{% if item.value.proxy_cache.proxy_cache_min_uses is defined and item.value.proxy_cache.proxy_cache_min_uses %}
40+
{% if item.value.proxy_cache.proxy_cache_min_uses is defined %}
4141
proxy_cache_min_uses {{ item.value.proxy_cache.proxy_cache_min_uses }};
4242
{% endif %}
4343
{% if item.value.proxy_cache.proxy_cache_revalidate is defined and item.value.proxy_cache.proxy_cache_revalidate %}
4444
proxy_cache_revalidate {{ item.value.proxy_cache.proxy_cache_revalidate | ternary("on", "off") }};
4545
{% endif %}
46-
{% if item.value.proxy_cache.proxy_cache_use_stale is defined and item.value.proxy_cache.proxy_cache_use_stale %}
46+
{% if item.value.proxy_cache.proxy_cache_use_stale is defined %}
4747
proxy_cache_use_stale {{ item.value.proxy_cache.proxy_cache_use_stale | join(" ") }};
4848
{% endif %}
49-
{% if item.value.proxy_cache.proxy_ignore_headers is defined and item.value.proxy_cache.proxy_ignore_headers %}
49+
{% if item.value.proxy_cache.proxy_ignore_headers is defined %}
5050
proxy_ignore_headers {{ item.value.proxy_cache.proxy_ignore_headers | join(" ") }};
5151
{% endif %}
52-
{% if item.value.proxy_cache.proxy_temp_path is defined and item.value.proxy_cache.proxy_temp_path.path %}
52+
{% if item.value.proxy_cache.proxy_temp_path is defined %}
5353
proxy_temp_path {{ item.value.proxy_cache.proxy_temp_path.path }} {{ item.value.proxy_cache.proxy_temp_path.level_1 | default("") }} {{ item.value.proxy_cache.proxy_temp_path.level_2 | default("") }} {{ item.value.proxy_cache.proxy_temp_path.level_3 | default("") }};
5454
{% endif %}
5555
{% if item.value.proxy_cache.proxy_cache_valid is defined %}
@@ -101,7 +101,7 @@ server {
101101
{{ gzip(item.value.servers[server].gzip) }}
102102
{% endfilter %}
103103
{% endif %}
104-
{% if item.value.servers[server].ssl is defined and item.value.servers[server].ssl %}
104+
{% if item.value.servers[server].ssl is defined %}
105105
ssl_certificate {{ item.value.servers[server].ssl.cert }};
106106
ssl_certificate_key {{ item.value.servers[server].ssl.key }};
107107
{% if item.value.servers[server].ssl.trusted_cert is defined %}
@@ -110,19 +110,19 @@ server {
110110
{% if item.value.servers[server].ssl.dhparam is defined %}
111111
ssl_dhparam {{ item.value.servers[server].ssl.dhparam }};
112112
{% endif %}
113-
{% if item.value.servers[server].ssl.protocols is defined and item.value.servers[server].ssl.protocols %}
113+
{% if item.value.servers[server].ssl.protocols is defined %}
114114
ssl_protocols {{ item.value.servers[server].ssl.protocols }};
115115
{% endif %}
116-
{% if item.value.servers[server].ssl.ciphers is defined and item.value.servers[server].ssl.ciphers %}
116+
{% if item.value.servers[server].ssl.ciphers is defined %}
117117
ssl_ciphers {{ item.value.servers[server].ssl.ciphers }};
118118
{% endif %}
119119
{% if item.value.servers[server].ssl.prefer_server_ciphers is defined and item.value.servers[server].ssl.prefer_server_ciphers %}
120120
ssl_prefer_server_ciphers on;
121121
{% endif %}
122-
{% if item.value.servers[server].ssl.session_cache is defined and item.value.servers[server].ssl.session_cache %}
122+
{% if item.value.servers[server].ssl.session_cache is defined %}
123123
ssl_session_cache {{ item.value.servers[server].ssl.session_cache }};
124124
{% endif %}
125-
{% if item.value.servers[server].ssl.session_timeout is defined and item.value.servers[server].ssl.session_timeout %}
125+
{% if item.value.servers[server].ssl.session_timeout is defined %}
126126
ssl_session_timeout {{ item.value.servers[server].ssl.session_timeout }};
127127
{% endif %}
128128
{% if item.value.servers[server].ssl.disable_session_tickets is defined and item.value.servers[server].ssl.disable_session_tickets %}
@@ -134,10 +134,10 @@ server {
134134
{% if item.value.servers[server].ssl.stapling_verify is defined and item.value.servers[server].ssl.stapling_verify %}
135135
ssl_stapling_verify on;
136136
{% endif %}
137-
{% if item.value.servers[server].ssl.ecdh_curve is defined and item.value.servers[server].ssl.ecdh_curve %}
137+
{% if item.value.servers[server].ssl.ecdh_curve is defined %}
138138
ssl_ecdh_curve {{ item.value.servers[server].ssl.ecdh_curve }};
139139
{% endif %}
140-
{% if item.value.servers[server].ssl.buffer_size is defined and item.value.servers[server].ssl.buffer_size %}
140+
{% if item.value.servers[server].ssl.buffer_size is defined %}
141141
ssl_buffer_size {{ item.value.servers[server].ssl.buffer_size }};
142142
{% endif %}
143143
{% endif %}
@@ -156,16 +156,16 @@ server {
156156
add_header {{ item.value.servers[server].add_headers[header].name }} "{{ item.value.servers[server].add_headers[header].value }}"{% if item.value.servers[server].add_headers[header].always is defined and item.value.servers[server].add_headers[header].always %} always{% endif %};
157157
{% endfor %}
158158
{% endif %}
159-
{% if item.value.servers[server].auth_basic is defined and item.value.servers[server].auth_basic %}
159+
{% if item.value.servers[server].auth_basic is defined %}
160160
auth_basic "{{ item.value.servers[server].auth_basic }}";
161161
{% endif %}
162-
{% if item.value.servers[server].auth_basic_user_file is defined and item.value.servers[server].auth_basic_user_file %}
162+
{% if item.value.servers[server].auth_basic_user_file is defined %}
163163
auth_basic_user_file {{ item.value.servers[server].auth_basic_user_file }};
164164
{% endif %}
165-
{% if item.value.servers[server].root is defined and item.value.servers[server].root %}
165+
{% if item.value.servers[server].root is defined %}
166166
root {{ item.value.servers[server].root }};
167167
{% endif %}
168-
{% if item.value.servers[server].https_redirect is defined and item.value.servers[server].https_redirect %}
168+
{% if item.value.servers[server].https_redirect is defined %}
169169
return 301 https://{{ item.value.servers[server].https_redirect }}$request_uri;
170170
{% endif %}
171171
{% if item.value.servers[server].autoindex is defined and item.value.servers[server].autoindex %}
@@ -180,7 +180,7 @@ server {
180180
{% if item.value.servers[server].auth_request_set is defined %}
181181
auth_request_set {{ item.value.servers[server].auth_request_set.name }} {{ item.value.servers[server].auth_request_set.value }};
182182
{% endif %}
183-
{% if item.value.servers[server].client_max_body_size is defined and item.value.servers[server].client_max_body_size %}
183+
{% if item.value.servers[server].client_max_body_size is defined %}
184184
client_max_body_size {{ item.value.servers[server].client_max_body_size }};
185185
{% endif %}
186186
{% if item.value.servers[server].sub_filter.sub_filters is defined and item.value.servers[server].sub_filter.sub_filters | length %}
@@ -194,7 +194,7 @@ server {
194194
{% if item.value.servers[server].sub_filter.once is defined %}
195195
sub_filter_once {{ item.value.servers[server].sub_filter.once | ternary("on", "off") }};
196196
{% endif %}
197-
{% if item.value.servers[server].sub_filter.types is defined and item.value.servers[server].sub_filter.types %}
197+
{% if item.value.servers[server].sub_filter.types is defined %}
198198
sub_filter_types {{ item.value.servers[server].sub_filter.types }};
199199
{% endif %}
200200
{% if item.value.servers[server].custom_options is defined and item.value.servers[server].custom_options | length %}
@@ -203,7 +203,7 @@ server {
203203
{% endfor %}
204204
{% endif %}
205205

206-
{% if item.value.servers[server].reverse_proxy is defined and item.value.servers[server].reverse_proxy %}
206+
{% if item.value.servers[server].reverse_proxy is defined %}
207207
{% for location in item.value.servers[server].reverse_proxy.locations %}
208208
location {{ item.value.servers[server].reverse_proxy.locations[location].location }} {
209209
{% if item.value.servers[server].reverse_proxy.locations[location].internal is sameas true %}
@@ -254,10 +254,10 @@ server {
254254
{% if item.value.servers[server].reverse_proxy.locations[location].auth_request_set is defined %}
255255
auth_request_set {{ item.value.servers[server].reverse_proxy.locations[location].auth_request_set.name }} {{ item.value.servers[server].reverse_proxy.locations[location].auth_request_set.value }};
256256
{% endif %}
257-
{% if item.value.servers[server].reverse_proxy.locations[location].auth_basic is defined and item.value.servers[server].reverse_proxy.locations[location].auth_basic %}
257+
{% if item.value.servers[server].reverse_proxy.locations[location].auth_basic is defined %}
258258
auth_basic "{{ item.value.servers[server].reverse_proxy.locations[location].auth_basic }}";
259259
{% endif %}
260-
{% if item.value.servers[server].reverse_proxy.locations[location].auth_basic_user_file is defined and item.value.servers[server].reverse_proxy.locations[location].auth_basic_user_file %}
260+
{% if item.value.servers[server].reverse_proxy.locations[location].auth_basic_user_file is defined %}
261261
auth_basic_user_file {{ item.value.servers[server].reverse_proxy.locations[location].auth_basic_user_file }};
262262
{% endif %}
263263
{% if item.value.servers[server].web_server.locations[location].allows is defined %}
@@ -279,7 +279,7 @@ server {
279279
{% endif %}
280280
{% endfor %}
281281
{% endif %}
282-
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_connect_timeout is defined and item.value.servers[server].reverse_proxy.locations[location].proxy_connect_timeout %}
282+
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_connect_timeout is defined %}
283283
proxy_connect_timeout {{ item.value.servers[server].reverse_proxy.locations[location].proxy_connect_timeout }};
284284
{% endif %}
285285
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_pass is defined %}
@@ -290,10 +290,10 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
290290
rewrite {{ rewrite }};
291291
{% endfor %}
292292
{% endif %}
293-
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_read_timeout is defined and item.value.servers[server].reverse_proxy.locations[location].proxy_read_timeout %}
293+
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_read_timeout is defined %}
294294
proxy_read_timeout {{ item.value.servers[server].reverse_proxy.locations[location].proxy_read_timeout }};
295295
{% endif %}
296-
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_send_timeout is defined and item.value.servers[server].reverse_proxy.locations[location].proxy_send_timeout %}
296+
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_send_timeout is defined %}
297297
proxy_send_timeout {{ item.value.servers[server].reverse_proxy.locations[location].proxy_send_timeout }};
298298
{% endif %}
299299
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_pass_request_body is defined %}
@@ -323,15 +323,15 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
323323
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_http_version is defined %}
324324
proxy_http_version {{ item.value.servers[server].reverse_proxy.locations[location].proxy_http_version }};
325325
{% endif %}
326-
{% if item.value.servers[server].reverse_proxy.locations[location].websocket is defined and item.value.servers[server].reverse_proxy.locations[location].websocket %}
326+
{% if item.value.servers[server].reverse_proxy.locations[location].websocket is defined %}
327327
proxy_set_header Upgrade $http_upgrade;
328328
proxy_set_header Connection "Upgrade";
329329
{% endif %}
330330
{% if item.value.servers[server].reverse_proxy.locations[location].try_files is defined %}
331331
try_files {{ item.value.servers[server].reverse_proxy.locations[location].try_files }};
332332
{% endif %}
333333

334-
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_ssl is defined and item.value.servers[server].reverse_proxy.locations[location].proxy_ssl %}
334+
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_ssl is defined %}
335335
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_ssl.cert is defined %}
336336
proxy_ssl_certificate {{ item.value.servers[server].reverse_proxy.locations[location].proxy_ssl.cert }};
337337
{% endif %}
@@ -399,7 +399,7 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
399399
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_ignore_headers is defined %}
400400
proxy_ignore_headers {{ item.value.servers[server].reverse_proxy.locations[location].proxy_ignore_headers | join(" ") }};
401401
{% endif %}
402-
{% if item.value.servers[server].reverse_proxy.locations[location].client_max_body_size is defined and item.value.servers[server].reverse_proxy.locations[location].client_max_body_size %}
402+
{% if item.value.servers[server].reverse_proxy.locations[location].client_max_body_size is defined %}
403403
client_max_body_size {{ item.value.servers[server].reverse_proxy.locations[location].client_max_body_size }};
404404
{% endif %}
405405
{% if item.value.servers[server].reverse_proxy.locations[location].proxy_cookie_path is defined %}
@@ -419,15 +419,15 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
419419
{% if item.value.servers[server].reverse_proxy.locations[location].sub_filter.once is defined %}
420420
sub_filter_once {{ item.value.servers[server].reverse_proxy.locations[location].sub_filter.once | ternary("on", "off") }};
421421
{% endif %}
422-
{% if item.value.servers[server].reverse_proxy.locations[location].sub_filter.types is defined and item.value.servers[server].reverse_proxy.locations[location].sub_filter.types %}
422+
{% if item.value.servers[server].reverse_proxy.locations[location].sub_filter.types is defined %}
423423
sub_filter_types {{ item.value.servers[server].reverse_proxy.locations[location].sub_filter.types }};
424424
{% endif %}
425425
{% if item.value.servers[server].reverse_proxy.locations[location].custom_options is defined and item.value.servers[server].reverse_proxy.locations[location].custom_options | length %}
426426
{% for inline_option in item.value.servers[server].reverse_proxy.locations[location].custom_options %}
427427
{{ inline_option }}
428428
{% endfor %}
429429
{% endif %}
430-
{% if (item.value.servers[server].reverse_proxy.health_check_plus is defined) and item.value.servers[server].reverse_proxy.health_check_plus %}
430+
{% if item.value.servers[server].reverse_proxy.health_check_plus is defined %}
431431
health_check;
432432
{% endif %}
433433

@@ -491,10 +491,10 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
491491
{% endif %}
492492
{% endfor %}
493493
{% endif %}
494-
{% if item.value.servers[server].web_server.locations[location].auth_basic is defined and item.value.servers[server].web_server.locations[location].auth_basic %}
494+
{% if item.value.servers[server].web_server.locations[location].auth_basic is defined %}
495495
auth_basic "{{ item.value.servers[server].web_server.locations[location].auth_basic }}";
496496
{% endif %}
497-
{% if item.value.servers[server].web_server.locations[location].auth_basic_user_file is defined and item.value.servers[server].web_server.locations[location].auth_basic_user_file %}
497+
{% if item.value.servers[server].web_server.locations[location].auth_basic_user_file is defined %}
498498
auth_basic_user_file {{ item.value.servers[server].web_server.locations[location].auth_basic_user_file }};
499499
{% endif %}
500500
{% if item.value.servers[server].web_server.locations[location].auth_request is defined %}
@@ -514,7 +514,7 @@ proxy_pass {{ item.value.servers[server].reverse_proxy.locations[location].proxy
514514
{% if item.value.servers[server].web_server.locations[location].sub_filter.once is defined %}
515515
sub_filter_once {{ item.value.servers[server].web_server.locations[location].sub_filter.once | ternary("on", "off") }};
516516
{% endif %}
517-
{% if item.value.servers[server].web_server.locations[location].sub_filter.types is defined and item.value.servers[server].web_server.locations[location].sub_filter.types %}
517+
{% if item.value.servers[server].web_server.locations[location].sub_filter.types is defined %}
518518
sub_filter_types {{ item.value.servers[server].web_server.locations[location].sub_filter.types }};
519519
{% endif %}
520520
}

‎templates/nginx.conf.j2

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ events {
3232
{% endif %}
3333
}
3434

35-
{% if nginx_config_main_template.http_enable %}
35+
{% if nginx_config_main_template.http_enable is defined and nginx_config_main_template.http_enable %}
3636
http {
3737
include /etc/nginx/mime.types;
3838
default_type application/octet-stream;
@@ -84,17 +84,17 @@ http {
8484
{{ gzip(nginx_config_main_template.http_settings.gzip) }}
8585
{% endfilter %}
8686
{% endif %}
87-
{% if nginx_config_main_template.http_settings.cache %}
87+
{% if nginx_config_main_template.http_settings.cache is defined %}
8888
proxy_cache_path /tmp/cache keys_zone=one:10m;
8989
{% endif %}
90-
{% if nginx_config_main_template.http_settings.rate_limit %}
90+
{% if nginx_config_main_template.http_settings.rate_limit is defined %}
9191
limit_req_zone $binary_remote_addr zone=mylimit:10m rate=10r/s;
9292
{% endif %}
93-
{% if nginx_config_main_template.http_settings.keyval %}
93+
{% if nginx_config_main_template.http_settings.keyval is defined and nginx_config_main_template.http_settings.keyval %}
9494
keyval_zone zone={{nginx_config_main_template.http_settings.keyval.zone}}:32k state=one.keyval;
9595
keyval $arg_text $text zone=one;
9696
{% endif %}
97-
{% if nginx_config_main_template.http_global_autoindex | default(false) %}
97+
{% if nginx_config_main_template.http_global_autoindex is defined | default(false) %}
9898
autoindex on;
9999
{% endif %}
100100
{% if nginx_config_main_template.sub_filter.sub_filters is defined and nginx_config_main_template.sub_filter.sub_filters | length %}
@@ -108,7 +108,7 @@ http {
108108
{% if nginx_config_main_template.sub_filter.once is defined %}
109109
sub_filter_once {{ nginx_config_main_template.sub_filter.once | ternary("on", "off") }};
110110
{% endif %}
111-
{% if nginx_config_main_template.sub_filter.types is defined and nginx_config_main_template.sub_filter.types %}
111+
{% if nginx_config_main_template.sub_filter.types is defined %}
112112
sub_filter_types {{ nginx_config_main_template.sub_filter.types }};
113113
{% endif %}
114114
{% if nginx_config_main_template.http_custom_options is defined and nginx_config_main_template.http_custom_options | length %}

0 commit comments

Comments
 (0)