From 74a11c2ed8622359509d5c3abac7e359069f9f2d Mon Sep 17 00:00:00 2001
From: bunkerity <contact@bunkerity.com>
Date: Tue, 7 Mar 2023 16:57:45 +0100
Subject: [PATCH] fix wrong cert/key path for default server

---
 src/common/confs/default-server-http.conf | 4 ++--
 tests/ui/docker-compose.yml               | 3 +++
 tests/ui/tests.sh                         | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/common/confs/default-server-http.conf b/src/common/confs/default-server-http.conf
index 7a36c54be..80c2837da 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 /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 %}
 
diff --git a/tests/ui/docker-compose.yml b/tests/ui/docker-compose.yml
index 5d0ebf822..e6f58dd5e 100644
--- a/tests/ui/docker-compose.yml
+++ b/tests/ui/docker-compose.yml
@@ -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
diff --git a/tests/ui/tests.sh b/tests/ui/tests.sh
index 2b32bb3a7..60a762d8c 100755
--- a/tests/ui/tests.sh
+++ b/tests/ui/tests.sh
@@ -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