From b88fe971d64009ff533568e433e856d3285280b3 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 7 Aug 2018 15:39:57 +0300 Subject: [PATCH] Fix matrix-nginx-proxy.service dependency on riot-web, if riot-web disabled --- .../templates/systemd/matrix-nginx-proxy.service.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2 b/roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2 index 384a834c..579a1881 100644 --- a/roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2 +++ b/roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2 @@ -4,8 +4,10 @@ After=docker.service Requires=docker.service Requires=matrix-synapse.service After=matrix-synapse.service +{% if matrix_riot_web_enabled %} Requires=matrix-riot-web.service After=matrix-riot-web.service +{% endif %} [Service] Type=simple @@ -15,7 +17,9 @@ ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \ -p 80:80 \ -p 443:443 \ --link matrix-synapse:synapse \ + {% if matrix_riot_web_enabled %} --link matrix-riot-web:riot \ + {% endif %} -v {{ matrix_nginx_proxy_confd_path }}:/etc/nginx/conf.d:ro \ -v {{ matrix_ssl_certs_path }}:{{ matrix_ssl_certs_path }}:ro \ {{ docker_nginx_image }}