Bump recipe version

Reviewed-on: #16

.env.sample

@@ -30,6 +30,7 @@ LOCAL_DOMAIN=$DOMAIN
 
 # ALTERNATE_DOMAINS=$EXTRA_DOMAINS
 AUTHORIZED_FETCH=false
+DISALLOW_UNAUTHENTICATED_API_ACCESS=false
 LIMITED_FEDERATION_MODE=false
 
 # Deployment

README.md

@@ -2,7 +2,7 @@
 
 > A supported fork of Mastodon that provides local posting and a wider range of content types.
 
-The configuration aims to stay as close as possible to [coop-cloud/mastodon](https://git.autonomic.zone/coop-cloud/mastodon).
+The configuration aims to stay as close as possible to [coop-cloud/mastodon](https://git.coopcloud.tech/coop-cloud/mastodon).
 At some point, ideally, we could merge them. We don't have enough folks running
 both Mastodon & Hometown to understand if that is a good idea right now. To be
 discussed.
@@ -11,7 +11,7 @@ discussed.
 
 * **Category**: Apps
 * **Status**: 1
-* **Image**: [`decentral1se/hometown`](https://hub.docker.com/r/decentral1se/hometown)
+* **Image**: [`hometown`](https://git.coopcloud.tech/coop-cloud-chaos-patchs/docker-hometown), 1, Co-op Cloud custom image
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: Yes

abra.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ENTRYPOINT_CONF_VERSION=v6
+export ENTRYPOINT_CONF_VERSION=v7
 
 assets() {
   export OTP_SECRET=$(cat /run/secrets/otp_secret)

compose.elasticsearch.yml

@@ -2,6 +2,22 @@
 version: "3.8"
 
 services:
+  es:
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
+    environment:
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "cluster.name=es-mastodon"
+      - "discovery.type=single-node"
+      - "bootstrap.memory_lock=true"
+    networks:
+      - internal_network
+    volumes:
+      - es:/usr/share/elasticsearch/data
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+
   app:
     environment: &es-env
       - ES_ENABLED=true
@@ -13,3 +29,6 @@ services:
 
   sidekiq:
     environment: *es-env
+
+volumes:
+  es:

compose.s3.yml

@@ -16,6 +16,8 @@ services:
       - S3_OVERRIDE_PATH_STYLE
       - S3_OPEN_TIMEOUT
       - S3_READ_TIMEOUT
+      - S3_FORCE_SINGLE_REQUEST
+      - S3_ALIAS_HOST
     secrets: &s3-secrets
       - aws_secret_access_key
 

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.6-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.10-hometown-1.1.1
     command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
     networks: &bothNetworks
       - proxy
@@ -19,7 +19,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=1.0.0+v4.0.6-hometown-1.1.1"
+        - "coop-cloud.${STACK_NAME}.version=1.1.3+v4.0.10-hometown-1.1.1"
     configs: &configs
       - source: entrypoint_sh
         target: /usr/local/bin/entrypoint.sh
@@ -46,6 +46,7 @@ services:
       - DB_PORT
       - DB_USER
       - DEFAULT_LOCALE
+      - DISALLOW_UNAUTHENTICATED_API_ACCESS
       - EMAIL_DOMAIN_ALLOWLIST
       - EMAIL_DOMAIN_DENYLIST
       - LDAP_BASE
@@ -89,6 +90,7 @@ services:
       - OIDC_TOKEN_ENDPOINT
       - OIDC_UID_FIELD
       - OIDC_USER_INFO_ENDPOINT
+      - OTP_SECRET_FILE=/run/secrets/otp_secret
       - PAPERCLIP_ROOT_PATH
       - PAPERCLIP_ROOT_URL
       - RAILS_ENV
@@ -117,6 +119,7 @@ services:
       - SAML_SECURITY_WANT_ASSERTION_ENCRYPTED
       - SAML_SECURITY_WANT_ASSERTION_SIGNED
       - SAML_UID_ATTRIBUTE
+      - SECRET_KEY_BASE_FILE=/run/secrets/secret_key_base
       - SINGLE_USER_MODE
       - SMTP_AUTH_METHOD
       - SMTP_CA_FILE
@@ -139,7 +142,7 @@ services:
       - WEB_DOMAIN
 
   streaming:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.6-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.10-hometown-1.1.1
     command: node ./streaming
     configs: *configs
     entrypoint: *entrypoint
@@ -160,7 +163,7 @@ services:
     volumes: *appVolume # used to make sure this volume is created
 
   sidekiq:
-    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.6-hometown-1.1.1
+    image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.0.10-hometown-1.1.1
     secrets: *secrets
     command: bundle exec sidekiq
     configs: *configs
@@ -194,22 +197,6 @@ services:
     volumes:
       - redis:/data
 
-  es:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
-    environment:
-      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-      - "cluster.name=es-mastodon"
-      - "discovery.type=single-node"
-      - "bootstrap.memory_lock=true"
-    networks:
-      - internal_network
-    volumes:
-      - es:/usr/share/elasticsearch/data
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-
 secrets:
   secret_key_base:
     name: ${STACK_NAME}_secret_key_base_${SECRET_SECRET_KEY_BASE_VERSION}
@@ -231,7 +218,6 @@ volumes:
   app:
   redis:
   postgres:
-  es:
 
 networks:
   proxy: