From 8079825ec59df574d324cd6abde2ec30d9757e0a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 19 Feb 2023 19:00:51 +0100
Subject: [PATCH 1/2] Add .envrc for mastodon, setting correct triton

profile
---
 mastodon/.envrc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 mastodon/.envrc

diff --git a/mastodon/.envrc b/mastodon/.envrc
new file mode 100644
index 0000000..0c85f83
--- /dev/null
+++ b/mastodon/.envrc
@@ -0,0 +1,3 @@
+source_up
+
+ttp set cgn-1-pub_solar

From 6e14bc910c20911335614056c385192751243840 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Sun, 19 Feb 2023 19:02:00 +0100
Subject: [PATCH 2/2] mastodon: bump version to v4.1.0

Bump elasticsearch to 7.17.9

caddy: comment out access logging for mastodon
---
 mastodon/docker-compose.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
index 111f3fa..e48437d 100644
--- a/mastodon/docker-compose.yml
+++ b/mastodon/docker-compose.yml
@@ -57,9 +57,10 @@ services:
           @cache_control {
             path_regexp ^/(emoji|packs|/system/accounts/avatars|/system/media_attachments/files)
           }
-          log {
-            output stderr
-          }
+          # Uncomment only for debugging, we don't log by default
+          #log {
+          #  output stderr
+          #}
           handle /.well-known/keybase.txt {
             root * /srv
             file_server
@@ -134,7 +135,7 @@ services:
 #      - triton.cns.services=mastodon-redis
 
   web:
-    image: tootsuite/mastodon:v4.0.2
+    image: tootsuite/mastodon:v4.1.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -147,7 +148,7 @@ services:
       - triton.cns.services=mastodon-web
 
   streaming:
-    image: tootsuite/mastodon:v4.0.2
+    image: tootsuite/mastodon:v4.1.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -160,7 +161,7 @@ services:
       - triton.cns.services=mastodon-streaming
 
   sidekiq:
-    image: tootsuite/mastodon:v4.0.2
+    image: tootsuite/mastodon:v4.1.0
     mem_limit: 1g
     restart: always
     env_file: .env.production
@@ -170,7 +171,7 @@ services:
       - triton.cns.services=mastodon-sidekiq
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.4
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.9
     mem_limit: 512m
     restart: always
     environment: