Skip to content

Commit ff4d407

Browse files
authored
Fix #50: Add upstream server backup parameter to templates (#57)
1 parent 7c761b8 commit ff4d407

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
ENHANCEMENTS:
66

77
* Add support for NGINX GRPC directives.
8+
* Added support for upstream server `backup` parameter in http and stream template.
89
* Only run GitHub actions Galaxy CI/CD workflow when a new release is published.
910
* Update list of supported platforms.
1011

molecule/default/converge.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@
289289
address: 0.0.0.0
290290
port: 8083
291291
down: true
292+
backend_server_4:
293+
address: 0.0.0.0
294+
port: 8084
295+
backup: true
292296
frontend:
293297
template_file: http/default.conf.j2
294298
conf_file_name: frontend_default.conf
@@ -432,3 +436,7 @@
432436
address: 0.0.0.0
433437
port: 9092
434438
down: true
439+
backend_server_3:
440+
address: 0.0.0.0
441+
port: 8083
442+
backup: true

molecule/plus/converge.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,10 @@
275275
address: 0.0.0.0
276276
port: 8083
277277
down: true
278+
backend_server_4:
279+
address: 0.0.0.0
280+
port: 8084
281+
backup: true
278282
frontend:
279283
template_file: http/default.conf.j2
280284
conf_file_name: frontend_default.conf
@@ -418,3 +422,7 @@
418422
address: 0.0.0.0
419423
port: 9092
420424
down: true
425+
backend_server_3:
426+
address: 0.0.0.0
427+
port: 8083
428+
backup: true

templates/http/default.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ upstream {{ item.value.upstreams[upstream].name }} {
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 %}
13-
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
13+
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].backup is defined and item.value.upstreams[upstream].servers[server].backup %}backup{% endif %} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
1414
{% endfor %}
1515
{% if item.value.upstreams[upstream].sticky_cookie is defined and item.value.upstreams[upstream].sticky_cookie %}
1616
sticky cookie srv_id expires=1h path=/;

templates/stream/default.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ upstream {{ item.value.upstreams[upstream].name }} {
88
{% endif %}
99
zone {{ item.value.upstreams[upstream].zone_name }} {{ item.value.upstreams[upstream].zone_size }};
1010
{% for server in item.value.upstreams[upstream].servers %}
11-
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
11+
server {{ item.value.upstreams[upstream].servers[server].address }}{{(":" + item.value.upstreams[upstream].servers[server].port | string) if item.value.upstreams[upstream].servers[server].port is defined}} {% if item.value.upstreams[upstream].servers[server].backup is defined and item.value.upstreams[upstream].servers[server].backup %}backup{% endif %} {% if item.value.upstreams[upstream].servers[server].down is defined and item.value.upstreams[upstream].servers[server].down %}down{% else %}weight={{ item.value.upstreams[upstream].servers[server].weight | default("1") }} {{ item.value.upstreams[upstream].servers[server].health_check | default("") }}{% endif %};
1212
{% endfor %}
1313
{% if item.value.upstreams[upstream].sticky_cookie is defined %}
1414
{% if item.value.upstreams[upstream].sticky_cookie %}

0 commit comments

Comments
 (0)