From cebb80fa12f85b0d91ebc5e44f718f49278e4292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Tue, 22 Nov 2022 14:22:30 +0100
Subject: [PATCH] Set mastodon web VIRTUAL_PATH to /

---
 roles/docker/tasks/services/mastodon.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml
index 5ce5098..7da21df 100644
--- a/roles/docker/tasks/services/mastodon.yml
+++ b/roles/docker/tasks/services/mastodon.yml
@@ -70,6 +70,7 @@
           environment:
             VIRTUAL_HOST: "{{ mastodon.domain }}"
             VIRTUAL_PORT: "3000"
+            VIRTUAL_PATH: "/"
             LETSENCRYPT_HOST: "{{ mastodon.domain }}"
             LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
 
@@ -83,9 +84,9 @@
             - internal_network
           healthcheck:
             # prettier-ignore
-            # FIXME: locahost:4000
             test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
-          expose: 4000
+          ports:
+            - '127.0.0.1:4000:4000'
           depends_on:
             - db
             - redis
@@ -93,8 +94,6 @@
             VIRTUAL_HOST: "{{ mastodon.domain }}"
             VIRTUAL_PORT: "4000"
             VIRTUAL_PATH: "/api/v1/streaming"
-            LETSENCRYPT_HOST: "{{ mastodon.domain }}"
-            LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
 
         sidekiq:
           image: "tootsuite/mastodon:{{ mastodon_version }}"