Merge pull request 'Remove Benjamin as a maintainer' (#62) from remove_maintainer into main

Reviewed-on: #62

MAINTENANCE.md

@@ -0,0 +1,33 @@
+# Mastodon Recipe Maintenance
+
+All contributions should be made via a pull request. This is to ensure a
+certain quality and consistency, that others can rely on.
+
+## Maintainer Responsibilities
+
+Maintainers are responsible for installing regular updates:
+
+- Patch and minor updates within a week of them being released upstream
+- Major updates within a month of them being released upstream
+
+And responding to pull requests and issues, within a week of them being filed.
+
+In order to fulfill these responsibilities a recipe maintainer:
+
+- Has to watch the repository (to get notifications)
+- Needs to make sure Renovate is configured properly
+
+## Pull Requests
+
+A pull request can be merged if it is approved by at least one maintainer. For
+pull requests opened by a maintainer they need to be approved by another
+maintainer. Even though it is okay to merge a pull request with one approval, it
+is always better if all maintainers looked at the pull request and approved it.
+
+## Become a maintainer
+
+Everyone can apply to be a recipe maintainer:
+
+1. Watch the repository to always get updates
+2. Simply add yourself to the list in the [README.md](./README.md), add yourself to whichever things you would like to be (co) responsible for in this document, then open a new pull request with the change.
+3. Once the pull request gets merged you will be added to the [mastodon maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/mastodon-maintainers).

README.md

@@ -3,7 +3,7 @@
 > Your self-hosted, globally interconnected microblogging community
 
 <!-- metadata -->
-* **Maintainers**: `@3wordchant` (Matrix: `@3wc:autonomic.zone`), `Benjamin` (Matrix: `@benjaminlj:matrix.org`)
+* **Maintainers**: `@3wordchant` (Matrix: `@3wc:autonomic.zone`), `Nick` (Matrix: `@nicksellen:matrix.org`)
 * **Status**: `stable`
 * **Category**: Apps
 * **Features**: 1

abra.sh

@@ -1,5 +1,7 @@
 export ENTRYPOINT_CONF_VERSION=v7
 export ENTRYPOINT_STREAMING_CONF_VERSION=v2
+# we're using abra in english
+export LANG=C
 
 grep=grep
 if ! $grep -P --version 2>/dev/null 1>/dev/null

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: tootsuite/mastodon:v4.5.4
+    image: tootsuite/mastodon:v4.5.10
     command: |
       bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
     networks: &bothNetworks
@@ -20,7 +20,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=3.0.0+v4.5.4"
+        - "coop-cloud.${STACK_NAME}.version=3.0.5+v4.5.10"
     configs: &configs
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
@@ -129,7 +129,7 @@ services:
       - WEB_DOMAIN
 
   streaming:
-    image: tootsuite/mastodon-streaming:v4.5.4
+    image: tootsuite/mastodon-streaming:v4.5.10
     command: node ./streaming/index.js
     configs: *configs
     entrypoint: /usr/local/bin/entrypoint_streaming.sh
@@ -150,7 +150,7 @@ services:
     volumes: *appVolume
 
   sidekiq:
-    image: tootsuite/mastodon:v4.5.4
+    image: tootsuite/mastodon:v4.5.10
     secrets: *secrets
     command: bundle exec sidekiq
     configs: *configs
@@ -178,7 +178,7 @@ services:
       - POSTGRES_USER=${DB_USER}
 
   redis:
-    image: redis:8.4-alpine
+    image: redis:8.6-alpine
     networks: *internalNetwork
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]