Skip to content

Commit d74595c

Browse files
authored
v2.2.20 (#58)
Minor updates * Moving upstream config block to correct location
1 parent d0a6b38 commit d74595c

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/nginx:nginx1.20-2.2.21
1+
FROM bfren/nginx:nginx1.20-2.2.22
22

33
# port 80 is already exposed by the base image
44
EXPOSE 443

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.19
1+
2.2.20

overlay/etc/bf/templates/nginx-site.conf.esh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030
# Copyright (c) 2021 bfren
3131
#======================================================================================================================
3232
<% fi %>
33+
#======================================================================================================================
34+
# UPSTREAM SERVER(S)
35+
#======================================================================================================================
36+
37+
# optional file to have multiple upstream servers
38+
include <%= "${CUSTOM_CONF}/${DOMAIN_NAME}[.]upstream" %>;
39+
3340
#======================================================================================================================
3441
# HTTP
3542
#======================================================================================================================
@@ -78,9 +85,6 @@ server {
7885
}
7986
<% fi -%>
8087

81-
# optional file to have multiple upstream servers
82-
include <%= "${CUSTOM_CONF}/${DOMAIN_NAME}[.]upstream" %>;
83-
8488
# main site configuration block
8589
location / {
8690
proxy_pass <%= "${UPSTREAM}" %>;

0 commit comments

Comments
 (0)