merge upstream

This commit is contained in:
Michael
2021-03-16 21:52:26 +08:00
parent 571b70a1f4
commit 5a6bdb0c3d
44 changed files with 950 additions and 103 deletions

View File

@@ -17,7 +17,7 @@
proxy_pass http://$backend;
{% else %}
{# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:12080;
proxy_pass http://127.0.0.1:13080;
{% endif %}
proxy_set_header Host $host;
@@ -32,7 +32,7 @@
proxy_pass http://$backend;
{% else %}
{# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:12090;
proxy_pass http://127.0.0.1:13090;
{% endif %}
proxy_set_header Host $host;