finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix matrix-nginx-proxy.service dependency on riot-web, if riot-web disabled

Browse Source
This commit is contained in:
Slavi Pantaleev 2018-08-07 15:39:57 +03:00
parent cdf4eefdf9
commit b88fe971d6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-server/templates/systemd/matrix-nginx-proxy.service.j2
View File

@ -4,8 +4,10 @@ After=docker.service
Requires=docker.service Requires=docker.service
Requires=matrix-synapse.service Requires=matrix-synapse.service
After=matrix-synapse.service After=matrix-synapse.service
{% if matrix_riot_web_enabled %}
Requires=matrix-riot-web.service Requires=matrix-riot-web.service
After=matrix-riot-web.service After=matrix-riot-web.service
{% endif %}
[Service] [Service]
Type=simple Type=simple
@ -15,7 +17,9 @@ ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \
-p 80:80 \ -p 80:80 \
-p 443:443 \ -p 443:443 \
--link matrix-synapse:synapse \ --link matrix-synapse:synapse \
{% if matrix_riot_web_enabled %}
--link matrix-riot-web:riot \ --link matrix-riot-web:riot \
{% endif %}
-v {{ matrix_nginx_proxy_confd_path }}:/etc/nginx/conf.d:ro \ -v {{ matrix_nginx_proxy_confd_path }}:/etc/nginx/conf.d:ro \
-v {{ matrix_ssl_certs_path }}:{{ matrix_ssl_certs_path }}:ro \ -v {{ matrix_ssl_certs_path }}:{{ matrix_ssl_certs_path }}:ro \
{{ docker_nginx_image }} {{ docker_nginx_image }}