Commit 3f62ea2b authored by Jürgen Haas's avatar Jürgen Haas

Merge remote-tracking branch 'origin/master'

parents 0fbca777 425c43d6
......@@ -59,7 +59,9 @@ services:
- php
environment:
{% if webserver.type == 'nginx' %}
NGINX_DRUPAL_FILE_PROXY_URL: 'https://{{ live.uri }}'
{% if live is defined and live.uri is defined %}
NGINX_DRUPAL_FILE_PROXY_URL: '{{ live.uri }}'
{% endif %}
NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: 'off'
NGINX_ERROR_LOG_LEVEL: debug
{% elseif webserver.type == 'apache' %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment