Skip to content

Commit f73de25

Browse files
committed
Prepare 0.5.1 release
1 parent e78588c commit f73de25

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ updates:
77
interval: weekly
88
day: monday
99
time: "00:00"
10+
labels:
11+
- "dependencies"
12+
- "skip-changelog"
1013
- package-ecosystem: pip
1114
directory: /.github/workflows/requirements
1215
schedule:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 0.5.1 (Unreleased)
3+
## 0.5.1 (April 6, 2022)
44

55
FEATURES:
66

@@ -12,6 +12,7 @@ ENHANCEMENTS:
1212
* Add labels to loops in `tasks/config/template-config.yml` to reduce amount of output data.
1313
* Implement `gunzip`, `map`, `mirror`, `realip` and `split_clients` modules into `http` templates.
1414
* Streamline configuring SELinux.
15+
* Update Dependabot to trigger updates at the same time across all NGINX core roles at the same time and to avoid triggering release drafter on GitHub actions dependency updates.
1516

1617
BUG FIXES:
1718

defaults/main/template.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ nginx_config_http_template:
8181
deployment_location: /etc/nginx/conf.d/default.conf
8282
backup: true
8383
config:
84-
upstreams: # Configure NGINX upstreams
84+
upstreams: # Configure upstreams
8585
- name: backend # Required
8686
servers: # Cannot be used if 'state' directive is defined
8787
- address: localhost # Required -- You can use an IP address, a Unix socket, or a domain -- include port details inline if necessary
@@ -346,7 +346,7 @@ nginx_config_http_template:
346346
enable: true # Required
347347
uri: example.com
348348
port: 80
349-
proxy: # Configure Proxy
349+
proxy: # Configure proxy settings
350350
bind: # Set to 'false' and remove/comment nested variables to disable proxy_bind
351351
address: 0.0.0.0 # Required
352352
transparent: false # Boolean
@@ -501,7 +501,7 @@ nginx_config_http_template:
501501
ssl_trusted_certificate: /path/to/file
502502
ssl_verify: false # Boolean
503503
ssl_verify_depth: 1
504-
access: # Configure HTTP access
504+
access: # Configure access settings
505505
allow: localhost # String or a list of strings
506506
deny: 192.168.1.100 # String or a list of strings
507507
auth_basic: # Configure basic auth
@@ -528,7 +528,7 @@ nginx_config_http_template:
528528
leeway: 0s
529529
type: signed # Can be set to 'signed', 'encrypted' or 'nested'
530530
require: $valid_jwt_iss # String or a list of strings
531-
api: # Available only in NGINX Plus -- Configure NGINX Plus HTTP API
531+
api: # Available only in NGINX Plus -- Configure HTTP API
532532
enable: # true # Set to Boolean directly to simply enable the 'api' directive -- Available only in the 'location' context
533533
write: true # Boolean
534534
status_zone: one # Not available in the 'http' context
@@ -567,7 +567,7 @@ nginx_config_http_template:
567567
expires: # false # Can alternatively be set to 'false'
568568
modified: true # Boolean
569569
time: "12h"
570-
health_check: # Available only in NGINX Plus -- Configure NGINX Plus health checks
570+
health_check: # Available only in NGINX Plus -- Configure active health checks
571571
health_checks: # Available only in the 'location' context
572572
- interval: 5s
573573
jitter: 0
@@ -583,7 +583,7 @@ nginx_config_http_template:
583583
match: # Available only in the 'http' context
584584
- name: name # Required
585585
conditions: []
586-
keyval: # Available only in NGINX Plus -- Configure NGINX Plus key value store
586+
keyval: # Available only in NGINX Plus -- Configure key value store
587587
keyvals: # Available only in the 'http' context
588588
- key: key # Required
589589
variable: $var # Required
@@ -646,14 +646,14 @@ nginx_config_http_template:
646646
content: # Dictionary or list of dictionaries
647647
- value: default
648648
new_value: 0
649-
mirror: # Configure Mirror directives
649+
mirror: # Configure mirrors
650650
request_body: true # Boolean
651-
uri: false # Required -- String or a list of strings -- Can alternatively be set to 'false'
652-
realip: # Configure RealIP directives
651+
uri: false # String or a list of strings -- Can alternatively be set to 'false'
652+
realip: # Configure RealIP
653653
set_real_ip_from: 0.0.0.0
654654
real_ip_header: X-Real-IP
655655
real_ip_recursive: false # Boolean
656-
rewrite: # Configure rewrite directives
656+
rewrite: # Configure rewrites
657657
return: # Can also be set to a return URL or code directly -- Not available in the 'http' context
658658
code: 200 # Required -- You have to set either 'code' or 'url'
659659
text: text # Only available when using 'code'
@@ -675,7 +675,7 @@ nginx_config_http_template:
675675
value: appv2 # Required
676676
- percentage: "*" # Required
677677
value: app # Required
678-
sub_filter: # Configure sub_filter directives
678+
sub_filter: # Configure sub filters
679679
sub_filters: # Dictionary or a list of dictionaries
680680
- string: server_hostname # Required
681681
replacement: $hostname # Required
@@ -747,7 +747,7 @@ nginx_config_stream_template:
747747
- template_file: stream/default.conf.j2
748748
deployment_location: /etc/nginx/conf.d/streams/stream_default.conf
749749
config:
750-
upstreams: # Configure NGINX upstreamds
750+
upstreams: # Configure upstreams
751751
- name: stream_upstream # Required
752752
servers:
753753
- address: 0.0.0.0:9091 # Required
@@ -811,7 +811,7 @@ nginx_config_stream_template:
811811
tcp_nodelay: true # Boolean
812812
variables_hash_bucket_size: 64
813813
variables_hash_max_size: 1024
814-
ssl: # Configure Stream SSL
814+
ssl: # Configure SSL
815815
alpn: http/1.1 # String or a list of strings
816816
certificate: /etc/ssl/certs/molecule.crt # String or a list of strings
817817
certificate_key: /etc/ssl/private/molecule.key # String or a list of strings
@@ -844,7 +844,7 @@ nginx_config_stream_template:
844844
trusted_certificate: /path/to/file
845845
verify_client: false # Boolean -- Can also be set to 'optional' or 'optional_no_ca'
846846
verify_depth: 1 # Number
847-
proxy: # Configure Stream Proxy
847+
proxy: # Configure proxy settings
848848
bind: # Set to 'false' and remove/comment nested variables to disable proxy_bind
849849
address: 0.0.0.0 # Required
850850
transparent: false # Boolean
@@ -878,7 +878,7 @@ nginx_config_stream_template:
878878
ssl_verify_depth: 1 # Number
879879
timeout: 10m
880880
upload_rate: 0
881-
health_check: # Available only in NGINX Plus -- Configure NGINX Plus health checks
881+
health_check: # Available only in NGINX Plus -- Configure active health checks
882882
health_checks: # Available only in the 'server' context
883883
- interval: 5s
884884
jitter: 0
@@ -895,7 +895,7 @@ nginx_config_stream_template:
895895
conditions:
896896
- status 200
897897
timeout: 60s
898-
keyval: # Available only in NGINX Plus -- Configure NGINX Plus key value store
898+
keyval: # Available only in NGINX Plus -- Configure key value store
899899
keyvals: # Available only in the 'stream' context
900900
- key: key # Required
901901
variable: $var # Required

templates/http/modules.j2

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ autoindex_localtime {{ autoindex['localtime'] | ternary('on', 'off') }};
3737

3838
{% endmacro %}
3939

40-
{# NGINX HTTP GUNZIP template -- ngx_http_gunzip_module #}
40+
{# NGINX HTTP GUNZIP -- ngx_http_gunzip_module #}
4141
{% macro gunzip(gunzip) %}
4242
{% if gunzip['enable'] is defined and gunzip['enable'] is boolean %}
4343
gunzip {{ gunzip['enable'] | ternary('on', 'off') }};
@@ -48,7 +48,7 @@ gunzip_buffers {{ gunzip['buffers']['number'] }} {{ gunzip['buffers']['size'] }}
4848

4949
{% endmacro %}
5050

51-
{# NGINX HTTP GZIP template -- ngx_http_gzip_module #}
51+
{# NGINX HTTP GZIP -- ngx_http_gzip_module #}
5252
{% macro gzip(gzip) %}
5353
{% if gzip['enable'] is defined and gzip['enable'] is boolean %}
5454
gzip {{ gzip['enable'] | ternary('on', 'off') }};
@@ -238,7 +238,6 @@ map {{ map_data['string'] }} {{ map_data['variable'] }} {
238238

239239
{# NGINX HTTP Mirror -- ngx_http_mirror_module #}
240240
{% macro mirror(mirror) %}
241-
{% if mirror is defined %}
242241
{% if mirror['uri'] is defined and mirror['uri'] is not mapping %}
243242
{% for uri in mirror['uri'] if mirror['uri'] is not string %}
244243
mirror {{ 'off' if not uri else uri }};
@@ -249,7 +248,6 @@ mirror {{ 'off' if not mirror['uri'] else mirror['uri'] }};
249248
{% if mirror['request_body'] is defined and mirror['request_body'] is boolean %}
250249
mirror_request_body {{ mirror['request_body'] | ternary('on', 'off') }};
251250
{% endif %}
252-
{% endif %}
253251

254252
{% endmacro %}
255253

0 commit comments

Comments
 (0)