fix wrong cert/key path for default server

This commit is contained in:
bunkerity 2023-03-07 16:57:45 +01:00
parent b3769b6e3f
commit 74a11c2ed8
3 changed files with 8 additions and 4 deletions

View File

@ -15,8 +15,8 @@ server {
{% if os.path.isfile("/var/cache/bunkerweb/default-server-cert/cert.pem") +%}
{% if has_variable(all, "USE_CUSTOM_SSL", "yes") or has_variable(all, "AUTO_LETS_ENCRYPT", "yes") or has_variable(all, "GENERATE_SELF_SIGNED_SSL", "yes") +%}
listen 0.0.0.0:{{ HTTPS_PORT }} ssl {% if HTTP2 == "yes" %}http2{% endif %} default_server {% if USE_PROXY_PROTOCOL == "yes" %}proxy_protocol{% endif %};
ssl_certificate /var/cache/bunkerweb/selfsigned/{{ SERVER_NAME.split(" ")[0] }}.pem;
ssl_certificate_key /var/cache/bunkerweb/selfsigned/{{ SERVER_NAME.split(" ")[0] }}.key;
ssl_certificate /opt/bunkerweb/cache/default-server-cert/cert.pem;
ssl_certificate_key /opt/bunkerweb/cache/default-server-cert/cert.key;
{% endif %}
{% endif %}

View File

@ -3,6 +3,7 @@ version: "3.5"
services:
bw:
image: bunkerity/bunkerweb:1.5.0-beta
pull_policy: never
ports:
- 80:8080
- 443:8443
@ -32,6 +33,7 @@ services:
bw-scheduler:
image: bunkerity/bunkerweb-scheduler:1.5.0-beta
pull_policy: never
depends_on:
- bw
environment:
@ -44,6 +46,7 @@ services:
bw-ui:
image: bunkerity/bunkerweb-ui:1.5.0-beta
pull_policy: never
depends_on:
- bw
- docker-proxy

View File

@ -5,10 +5,11 @@ cd ./tests/ui
# Prepare environment
sed -i "s@bunkerity/bunkerweb:.*@local/bunkerweb-tests:$MODE@" docker-compose.yml
sed -i "s@bunkerity/bunkerweb:.*@local/scheduler-tests:$MODE@" docker-compose.yml
sed -i "s@bunkerity/bunkerweb-scheduler:.*@local/scheduler-tests:$MODE@" docker-compose.yml
sed -i "s@bunkerity/bunkerweb-ui:.*@local/scheduler-tests:$MODE@" docker-compose.yml
# Start stack
docker-compose pull --ignore-pull-failures
docker-compose pull
if [ $? -ne 0 ] ; then
echo "❌ Pull failed"
exit 1