From 2b1dbb1d460b0d16edd4b32640b3d9461a8cedab Mon Sep 17 00:00:00 2001 From: bunkerity Date: Tue, 7 Mar 2023 17:25:37 +0100 Subject: [PATCH] fix default cert path again and ignore pull errors for UI tests --- src/common/confs/default-server-http.conf | 4 ++-- tests/ui/tests.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/confs/default-server-http.conf b/src/common/confs/default-server-http.conf index 80c2837da..a9cad71e4 100644 --- a/src/common/confs/default-server-http.conf +++ b/src/common/confs/default-server-http.conf @@ -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 /opt/bunkerweb/cache/default-server-cert/cert.pem; - ssl_certificate_key /opt/bunkerweb/cache/default-server-cert/cert.key; + ssl_certificate /var/cache/bunkerweb/default-server-cert/cert.pem; + ssl_certificate_key /var/cache/bunkerweb/default-server-cert/cert.key; {% endif %} {% endif %} diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh index 60a762d8c..9d8234d04 100755 --- a/tests/ui/tests.sh +++ b/tests/ui/tests.sh @@ -9,7 +9,7 @@ sed -i "s@bunkerity/bunkerweb-scheduler:.*@local/scheduler-tests:$MODE@" docker- sed -i "s@bunkerity/bunkerweb-ui:.*@local/scheduler-tests:$MODE@" docker-compose.yml # Start stack -docker-compose pull +docker-compose pull --ignore-pull-failures if [ $? -ne 0 ] ; then echo "❌ Pull failed" exit 1