From 41059d54f880e1d58acb3a4b7c89463a3e26f647 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 10 Nov 2022 18:49:28 -0500
Subject: [PATCH 1/2] add mastodon conf

---
 mastodon.subdomain.conf.sample | 40 ++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 mastodon.subdomain.conf.sample

diff --git a/mastodon.subdomain.conf.sample b/mastodon.subdomain.conf.sample
new file mode 100644
index 0000000..169ac82
--- /dev/null
+++ b/mastodon.subdomain.conf.sample
@@ -0,0 +1,40 @@
+## Version 2022/11/10
+# make sure that your dns has a cname set for mastodon
+# make sure you set `WEB_DOMAIN=mastodon.example.com` env var for the mastodon container
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name mastodon.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth (requires ldap-location.conf in the location block)
+    #include /config/nginx/ldap-server.conf;
+
+    # enable for Authelia (requires authelia-location.conf in the location block)
+    #include /config/nginx/authelia-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable for ldap auth (requires ldap-server.conf in the server block)
+        #include /config/nginx/ldap-location.conf;
+
+        # enable for Authelia (requires authelia-server.conf in the server block)
+        #include /config/nginx/authelia-location.conf;
+
+        include /config/nginx/proxy.conf;
+        include /config/nginx/resolver.conf;
+        set $upstream_app mastodon;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From 2371baf51da22fd8de239d2264a8bfd7cd5e65cd Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 10 Nov 2022 18:57:38 -0500
Subject: [PATCH 2/2] add info on webfinger redirect

---
 mastodon.subdomain.conf.sample | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon.subdomain.conf.sample b/mastodon.subdomain.conf.sample
index 169ac82..5a3d8f6 100644
--- a/mastodon.subdomain.conf.sample
+++ b/mastodon.subdomain.conf.sample
@@ -1,6 +1,9 @@
 ## Version 2022/11/10
 # make sure that your dns has a cname set for mastodon
 # make sure you set `WEB_DOMAIN=mastodon.example.com` env var for the mastodon container
+# if you set `LOCAL_DOMAIN=example.com` (without the mastodon subdomain), then don't forget to add
+# the location block for redirecting `/.well-known/webfinger` into your main server block for the WEB_DOMAIN
+# See the upstream docs for more info: https://docs.joinmastodon.org/admin/config/#basic
 
 server {
     listen 443 ssl;