Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1498pull/1525/head
| @@ -19,6 +19,15 @@ matrix_nginx_proxy_systemd_required_services_list: ['docker.service'] | |||||
| # List of systemd services that matrix-nginx-proxy.service wants | # List of systemd services that matrix-nginx-proxy.service wants | ||||
| matrix_nginx_proxy_systemd_wanted_services_list: [] | matrix_nginx_proxy_systemd_wanted_services_list: [] | ||||
| # A list of additional container networks that matrix-nginx-proxy would be connected to. | |||||
| # The playbook does not create these networks, so make sure they already exist. | |||||
| # | |||||
| # Use this to expose matrix-nginx-proxy to another reverse proxy, which runs in a different container network, | |||||
| # without exposing all other Matrix services to that other reverse-proxy. | |||||
| # | |||||
| # For background, see: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1498 | |||||
| matrix_nginx_proxy_container_additional_networks: [] | |||||
| # A list of additional "volumes" to mount in the container. | # A list of additional "volumes" to mount in the container. | ||||
| # This list gets populated dynamically at runtime. You can provide a different default value, | # This list gets populated dynamically at runtime. You can provide a different default value, | ||||
| # if you wish to mount your own files into the container. | # if you wish to mount your own files into the container. | ||||
| @@ -47,6 +47,10 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-nginx-proxy \ | |||||
| {% endfor %} | {% endfor %} | ||||
| {{ matrix_nginx_proxy_docker_image }} | {{ matrix_nginx_proxy_docker_image }} | ||||
| {% for network in matrix_nginx_proxy_container_additional_networks %} | |||||
| ExecStartPost={{ matrix_host_command_sh }} -c 'attempt=0; while [ $attempt -le 29 ]; do attempt=$(( $attempt + 1 )); if [ "`docker inspect -f {{ '{{.State.Running}}' }} matrix-nginx-proxy 2> /dev/null`" = "true" ]; then break; fi; sleep 1; done; {{ matrix_host_command_docker }} network connect {{ network }} matrix-nginx-proxy' | |||||
| {% endfor %} | |||||
| ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-nginx-proxy 2>/dev/null' | ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} kill matrix-nginx-proxy 2>/dev/null' | ||||
| ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-nginx-proxy 2>/dev/null' | ExecStopPost=-{{ matrix_host_command_sh }} -c '{{ matrix_host_command_docker }} rm matrix-nginx-proxy 2>/dev/null' | ||||
| ExecReload={{ matrix_host_command_docker }} exec matrix-nginx-proxy /usr/sbin/nginx -s reload | ExecReload={{ matrix_host_command_docker }} exec matrix-nginx-proxy /usr/sbin/nginx -s reload | ||||