fix default cert path again and ignore pull errors for UI tests

This commit is contained in:
bunkerity 2023-03-07 17:25:37 +01:00
parent 74a11c2ed8
commit 2b1dbb1d46
2 changed files with 3 additions and 3 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 /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 %}

View File

@ -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