Compare commits
41 Commits
mastodon_3
...
update-121
| Author | SHA1 | Date | |
|---|---|---|---|
| 00d71c3fb6 | |||
| 139a1e468f | |||
| 82db6c381b | |||
| dceab43179 | |||
| f3a59762b4 | |||
| 5a88112605 | |||
| b8e2929bf2 | |||
| 18a956d084 | |||
| 7525e5826c | |||
|
2ca92dd55f
|
|||
| 080fcd7a2d | |||
| 556d73cce8 | |||
| f6c2527182 | |||
| 953faaca83 | |||
| 547cefbd19 | |||
|
91ed3cf439
|
|||
|
6f31be3458
|
|||
| 4e8ae43423 | |||
| 2e46a01082 | |||
| 1155b3cc50 | |||
| 66adadea97 | |||
|
e776970066
|
|||
|
eab512222a
|
|||
| 9d5e427b80 | |||
| c1ca15ff87 | |||
| f4ad09c3b2 | |||
| 3fc213854f | |||
| 7cec462a60 | |||
| acee84e403 | |||
| 307037b36b | |||
| 86bef2441d | |||
| 2e446c4467 | |||
| 21e07e59ed | |||
| e6f7efaa44 | |||
| 2dc49d51e4 | |||
| 754ab9411c | |||
| fd89ab14ce | |||
| 205a882653 | |||
| 0bed30c1bf | |||
| 284984d49c | |||
| 1338294417 |
@ -38,7 +38,7 @@ steps:
|
||||
from_secret: drone_abra-bot_token
|
||||
fork: true
|
||||
repositories:
|
||||
- coop-cloud/auto-recipes-catalogue-json
|
||||
- toolshed/auto-recipes-catalogue-json
|
||||
|
||||
trigger:
|
||||
event: tag
|
||||
|
||||
13
.env.sample
13
.env.sample
@ -1,6 +1,6 @@
|
||||
TYPE=hometown
|
||||
|
||||
DOMAIN={{ .Domain }}
|
||||
DOMAIN=hometown.example.com
|
||||
# Enables WEB_DOMAIN if set (FOR FUTURE USE)
|
||||
# USER_DOMAIN=
|
||||
|
||||
@ -30,6 +30,7 @@ LOCAL_DOMAIN=$DOMAIN
|
||||
|
||||
# ALTERNATE_DOMAINS=$EXTRA_DOMAINS
|
||||
AUTHORIZED_FETCH=false
|
||||
DISALLOW_UNAUTHENTICATED_API_ACCESS=false
|
||||
LIMITED_FEDERATION_MODE=false
|
||||
|
||||
# Deployment
|
||||
@ -53,15 +54,13 @@ DB_PORT=5432
|
||||
REDIS_HOST=redis
|
||||
REDIS_PORT=6379
|
||||
# REDIS_URL=
|
||||
# REDIS_NAMESPACE=
|
||||
# CACHE_REDIS_HOST=
|
||||
# CACHE_REDIS_PORT=
|
||||
# CACHE_REDIS_URL=
|
||||
# CACHE_REDIS_NAMESPACE=
|
||||
|
||||
# ElasticSearch
|
||||
# --------------------------------------
|
||||
ES_ENABLED=true
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.elasticsearch.yml"
|
||||
ES_HOST=es
|
||||
ES_PORT=9200
|
||||
|
||||
@ -77,6 +76,10 @@ SECRET_OTP_SECRET_VERSION=v1
|
||||
SECRET_VAPID_PRIVATE_KEY_VERSION=v1
|
||||
SECRET_DB_PASSWORD_VERSION=v1
|
||||
SECRET_SMTP_PASSWORD_VERSION=v1
|
||||
SECRET_AWS_SECRET_ACCESS_KEY_VERSION=v1
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION=v1
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION=v1
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION=v1
|
||||
|
||||
# Web Push
|
||||
# ========
|
||||
@ -118,7 +121,7 @@ DEFAULT_LOCALE=en
|
||||
|
||||
# S3 and AWS
|
||||
# ----------
|
||||
# S3_ENABLED=
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.s3.yml"
|
||||
# S3_BUCKET=
|
||||
# AWS_ACCESS_KEY_ID=
|
||||
# AWS_SECRET_ACCESS_KEY=
|
||||
|
||||
@ -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
|
||||
|
||||
138
abra.sh
138
abra.sh
@ -1,70 +1,92 @@
|
||||
#!/bin/bash
|
||||
|
||||
export ENTRYPOINT_CONF_VERSION=v6
|
||||
export ENTRYPOINT_CONF_VERSION=v9
|
||||
|
||||
assets() {
|
||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
||||
export DB_PASS=$(cat /run/secrets/db_password)
|
||||
file_env() {
|
||||
local var="$1"
|
||||
local fileVar="${var}_FILE"
|
||||
local def="${2:-}"
|
||||
|
||||
RAILS_ENV=production bundle exec rails assets:precompile
|
||||
if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
|
||||
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local val="$def"
|
||||
if [ "${!var:-}" ]; then
|
||||
val="${!var}"
|
||||
elif [ "${!fileVar:-}" ]; then
|
||||
val="$(< "${!fileVar}")"
|
||||
fi
|
||||
|
||||
declare -x -g "$var"="$val"
|
||||
unset "$fileVar"
|
||||
}
|
||||
|
||||
setup() {
|
||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
||||
export DB_PASS=$(cat /run/secrets/db_password)
|
||||
environment() {
|
||||
# for sidekiq service bundle exec env var threading
|
||||
file_env "OTP_SECRET"
|
||||
file_env "SECRET_KEY_BASE"
|
||||
file_env "DB_PASS"
|
||||
file_env "SMTP_PASSWORD"
|
||||
file_env "VAPID_PRIVATE_KEY"
|
||||
|
||||
RAILS_ENV=production bundle exec rake db:setup
|
||||
declare -x RAILS_ENV=production
|
||||
}
|
||||
|
||||
admin() {
|
||||
export OTP_SECRET=$(cat /run/secrets/otp_secret)
|
||||
export SECRET_KEY_BASE=$(cat /run/secrets/secret_key_base)
|
||||
export DB_PASS=$(cat /run/secrets/db_password)
|
||||
|
||||
RAILS_ENV=production bin/tootctl accounts create "$1" --email "$2" --confirmed --role admin
|
||||
setup_admin() {
|
||||
## Create an admin user
|
||||
environment
|
||||
accounts create "$1" --email "$2" --confirmed --role admin
|
||||
}
|
||||
|
||||
secrets() {
|
||||
docker context use default > /dev/null 2>&1
|
||||
|
||||
echo "Generating secrets for new Hometown deployment..."
|
||||
echo ""
|
||||
|
||||
SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" secret_key_base v1 "$SECRET_KEY_BASE"
|
||||
echo "SECRET_KEY_BASE = $SECRET_KEY_BASE"
|
||||
echo ""
|
||||
|
||||
OTP_SECRET=$(docker run --rm tootsuite/mastodon:v3.4.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" otp_secret v1 "$OTP_SECRET"
|
||||
echo "OTP_SECRET = $OTP_SECRET"
|
||||
echo ""
|
||||
|
||||
docker run \
|
||||
-e SECRET_KEY_BASE="$SECRET_KEY_BASE" \
|
||||
-e OTP_SECRET="$OTP_SECRET" \
|
||||
--rm tootsuite/mastodon:v3.4.0 \
|
||||
bundle exec rake mastodon:webpush:generate_vapid_key \
|
||||
> /tmp/key.txt
|
||||
|
||||
VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
|
||||
VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
|
||||
rm -rf /tmp/key.txt
|
||||
|
||||
echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY"
|
||||
echo "!IMPORTANT! you MUST insert this VAPID_PUBLIC_KEY into your app .env config !IMPORTANT!"
|
||||
echo ""
|
||||
|
||||
abra app secret insert "$APP_NAME" vapid_private_key v1 "$VAPID_PRIVATE_KEY"
|
||||
echo "VAPID_PRIVATE_KEY = $VAPID_PRIVATE_KEY"
|
||||
echo ""
|
||||
|
||||
abra app secret generate "$APP_NAME" db_password v1
|
||||
echo ""
|
||||
|
||||
echo "don't forget to insert your smtp_password! your deployment won't work without it"
|
||||
echo "run \"abra app secret insert $APP_NAME smtp_password v1 YOURSMTPPASSWORD\""
|
||||
echo ""
|
||||
shell() {
|
||||
## Run a shell with proper environment
|
||||
environment
|
||||
bash $@
|
||||
}
|
||||
|
||||
generate_secrets() {
|
||||
## Run `abra app cmd -l <yourdomain> generate_secrets` to use Docker to generate secrets you'll need to deploy
|
||||
## your new instance (and create the secrets on target app).
|
||||
docker context use default > /dev/null 2>&1
|
||||
|
||||
echo "Generating secrets for new Hometown deployment..."
|
||||
echo ""
|
||||
|
||||
SECRET_KEY_BASE=$(docker run --rm tootsuite/mastodon:v4.2.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" secret_key_base v1 "$SECRET_KEY_BASE"
|
||||
echo "SECRET_KEY_BASE = $SECRET_KEY_BASE"
|
||||
echo ""
|
||||
|
||||
OTP_SECRET=$(docker run --rm tootsuite/mastodon:v4.2.0 bundle exec rake secret)
|
||||
abra app secret insert "$APP_NAME" otp_secret v1 "$OTP_SECRET"
|
||||
echo "OTP_SECRET = $OTP_SECRET"
|
||||
echo ""
|
||||
|
||||
docker run \
|
||||
-e SECRET_KEY_BASE="$SECRET_KEY_BASE" \
|
||||
-e OTP_SECRET="$OTP_SECRET" \
|
||||
--rm tootsuite/mastodon:v3.4.0 \
|
||||
bundle exec rake mastodon:webpush:generate_vapid_key \
|
||||
> /tmp/key.txt
|
||||
|
||||
VAPID_PRIVATE_KEY=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "/tmp/key.txt")
|
||||
VAPID_PUBLIC_KEY=$(grep -oP "VAPID_PUBLIC_KEY=\K.+" "/tmp/key.txt")
|
||||
rm -rf /tmp/key.txt
|
||||
|
||||
echo "VAPID_PUBLIC_KEY = $VAPID_PUBLIC_KEY"
|
||||
echo "!IMPORTANT! you MUST insert this VAPID_PUBLIC_KEY into your app .env config !IMPORTANT!"
|
||||
echo ""
|
||||
|
||||
abra app secret insert "$APP_NAME" vapid_private_key v1 "$VAPID_PRIVATE_KEY"
|
||||
echo "VAPID_PRIVATE_KEY = $VAPID_PRIVATE_KEY"
|
||||
echo ""
|
||||
|
||||
abra app secret generate "$APP_NAME" db_password v1
|
||||
echo ""
|
||||
|
||||
echo "don't forget to insert your smtp_password! your deployment won't work without it"
|
||||
echo "run \"abra app secret insert $APP_NAME smtp_password v1 YOURSMTPPASSWORD\""
|
||||
echo ""
|
||||
}
|
||||
|
||||
34
compose.elasticsearch.yml
Normal file
34
compose.elasticsearch.yml
Normal file
@ -0,0 +1,34 @@
|
||||
---
|
||||
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
|
||||
- ES_HOST
|
||||
- ES_PORT
|
||||
|
||||
streaming:
|
||||
environment: *es-env
|
||||
|
||||
sidekiq:
|
||||
environment: *es-env
|
||||
|
||||
volumes:
|
||||
es:
|
||||
35
compose.s3.yml
Normal file
35
compose.s3.yml
Normal file
@ -0,0 +1,35 @@
|
||||
---
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
environment: &s3-env
|
||||
- S3_ENABLED=true
|
||||
- AWS_ACCESS_KEY_ID
|
||||
- AWS_SECRET_ACCESS_KEY_FILE=/run/secrets/aws_secret_access_key
|
||||
- S3_BUCKET
|
||||
- S3_REGION
|
||||
- S3_PROTOCOL
|
||||
- S3_HOSTNAME
|
||||
- S3_ENDPOINT
|
||||
- S3_SIGNATURE_VERSION
|
||||
- S3_OVERRIDE_PATH_STYLE
|
||||
- S3_OPEN_TIMEOUT
|
||||
- S3_READ_TIMEOUT
|
||||
- S3_FORCE_SINGLE_REQUEST
|
||||
- S3_ALIAS_HOST
|
||||
secrets: &s3-secrets
|
||||
- aws_secret_access_key
|
||||
|
||||
streaming:
|
||||
environment: *s3-env
|
||||
secrets: *s3-secrets
|
||||
|
||||
sidekiq:
|
||||
environment: *s3-env
|
||||
secrets: *s3-secrets
|
||||
|
||||
secrets:
|
||||
aws_secret_access_key:
|
||||
name: ${STACK_NAME}_aws_secret_access_key_${SECRET_AWS_SECRET_ACCESS_KEY_VERSION}
|
||||
external: true
|
||||
90
compose.yml
90
compose.yml
@ -3,8 +3,8 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v3.5.10-hometown-1.0.8
|
||||
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1
|
||||
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rake db:migrate; bundle exec rails s -p 3000"
|
||||
networks: &bothNetworks
|
||||
- proxy
|
||||
- internal_network
|
||||
@ -19,9 +19,12 @@ 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=0.2.2+v3.5.10-hometown-1.0.8"
|
||||
- "coop-cloud.${STACK_NAME}.version=3.0.1+v4.5.11-hometown-1.2.1"
|
||||
configs: &configs
|
||||
- source: entrypoint_sh
|
||||
- source: entrypoint_common_sh
|
||||
target: /usr/local/bin/entrypoint.common.sh
|
||||
mode: 0555
|
||||
- source: entrypoint_main_sh
|
||||
target: /usr/local/bin/entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: &entrypoint /usr/local/bin/entrypoint.sh
|
||||
@ -33,24 +36,28 @@ services:
|
||||
- secret_key_base
|
||||
- smtp_password
|
||||
- vapid_private_key
|
||||
- enc_det_key
|
||||
- enc_salt
|
||||
- enc_pri_key
|
||||
environment: &env
|
||||
- ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_FILE=/run/secrets/enc_det_key
|
||||
- ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_FILE=/run/secrets/enc_salt
|
||||
- ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_FILE=/run/secrets/enc_pri_key
|
||||
- ALLOW_ACCESS_TO_HIDDEN_SERVICE
|
||||
- ALTERNATE_DOMAINS
|
||||
- AUTHORIZED_FETCH
|
||||
- CACHE_REDIS_HOST
|
||||
- CACHE_REDIS_NAMESPACE
|
||||
- CACHE_REDIS_PORT
|
||||
- CACHE_REDIS_URL
|
||||
- DB_HOST
|
||||
- DB_NAME
|
||||
- DB_PORT
|
||||
- DB_USER
|
||||
- DB_PASS_FILE=/run/secrets/db_password
|
||||
- DEFAULT_LOCALE
|
||||
- DISALLOW_UNAUTHENTICATED_API_ACCESS
|
||||
- EMAIL_DOMAIN_ALLOWLIST
|
||||
- EMAIL_DOMAIN_DENYLIST
|
||||
- ES_ENABLED
|
||||
- ES_HOST
|
||||
- ES_PORT
|
||||
- LDAP_BASE
|
||||
- LDAP_BIND_DN
|
||||
- LDAP_ENABLED
|
||||
@ -92,12 +99,12 @@ 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
|
||||
- RAILS_SERVE_STATIC_FILES
|
||||
- REDIS_HOST
|
||||
- REDIS_NAMESPACE
|
||||
- REDIS_PORT
|
||||
- REDIS_URL
|
||||
- SAML_ACS_URL
|
||||
@ -120,6 +127,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
|
||||
@ -142,9 +150,15 @@ services:
|
||||
- WEB_DOMAIN
|
||||
|
||||
streaming:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v3.5.10-hometown-1.0.8
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1-streaming
|
||||
command: node ./streaming
|
||||
configs: *configs
|
||||
configs:
|
||||
- source: entrypoint_common_sh
|
||||
target: /usr/local/bin/entrypoint.common.sh
|
||||
mode: 0555
|
||||
- source: entrypoint_streaming_sh
|
||||
target: /usr/local/bin/entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: *entrypoint
|
||||
secrets: *secrets
|
||||
networks: *bothNetworks
|
||||
@ -163,7 +177,7 @@ services:
|
||||
volumes: *appVolume # used to make sure this volume is created
|
||||
|
||||
sidekiq:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v3.5.10-hometown-1.0.8
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1
|
||||
secrets: *secrets
|
||||
command: bundle exec sidekiq
|
||||
configs: *configs
|
||||
@ -177,7 +191,7 @@ services:
|
||||
environment: *env
|
||||
|
||||
db:
|
||||
image: postgres:14.5-alpine
|
||||
image: postgres:14.10-alpine
|
||||
networks: &internalNetwork
|
||||
- internal_network
|
||||
volumes:
|
||||
@ -188,31 +202,23 @@ services:
|
||||
- POSTGRES_DB=${DB_NAME}
|
||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||
- POSTGRES_USER=${DB_USER}
|
||||
deploy:
|
||||
labels:
|
||||
- "backupbot.backup=true"
|
||||
- "backupbot.backup.pre-hook=sh -c \"mkdir -p /var/backup/hometown; /usr/local/bin/pg_dump -Fc -U ${DB_USER} ${DB_NAME} > /var/backup/hometown/backupbot.dump\""
|
||||
- "backupbot.backup.path=/var/backup/hometown"
|
||||
- "backupbot.backup.post-hook=rm -f /var/backup/hometown/backupbot.dump"
|
||||
- "backupbot.restore.post-hook=sh -c \"/usr/local/bin/pg_restore -U ${DB_USER} -d ${DB_NAME} -1 /var/backup/hometown/backupbot.dump\""
|
||||
|
||||
|
||||
redis:
|
||||
image: redis:7.0-alpine
|
||||
image: redis:7.4-alpine
|
||||
networks: *internalNetwork
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
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}
|
||||
@ -229,12 +235,20 @@ secrets:
|
||||
smtp_password:
|
||||
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
|
||||
external: true
|
||||
enc_det_key:
|
||||
name: ${STACK_NAME}_enc_det_key_${SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION}
|
||||
external: true
|
||||
enc_salt:
|
||||
name: ${STACK_NAME}_enc_salt_${SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION}
|
||||
external: true
|
||||
enc_pri_key:
|
||||
name: ${STACK_NAME}_enc_pri_key_${SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION}
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
app:
|
||||
redis:
|
||||
postgres:
|
||||
es:
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
@ -243,7 +257,15 @@ networks:
|
||||
internal: true
|
||||
|
||||
configs:
|
||||
entrypoint_sh:
|
||||
name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.sh.tmpl
|
||||
entrypoint_common_sh:
|
||||
name: ${STACK_NAME}_ep_common_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.common.sh.tmpl
|
||||
template_driver: golang
|
||||
entrypoint_main_sh:
|
||||
name: ${STACK_NAME}_ep_main_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.main.sh.tmpl
|
||||
template_driver: golang
|
||||
entrypoint_streaming_sh:
|
||||
name: ${STACK_NAME}_ep_streaming_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.streaming.sh.tmpl
|
||||
template_driver: golang
|
||||
|
||||
@ -23,14 +23,18 @@ file_env() {
|
||||
unset "$fileVar"
|
||||
}
|
||||
|
||||
export DB_PASS=$(cat /run/secrets/db_password)
|
||||
|
||||
# for sidekiq service bundle exec env var threading
|
||||
file_env "DB_PASS"
|
||||
file_env "OTP_SECRET"
|
||||
file_env "SECRET_KEY_BASE"
|
||||
file_env "SMTP_PASSWORD"
|
||||
file_env "VAPID_PRIVATE_KEY"
|
||||
file_env "AWS_SECRET_ACCESS_KEY"
|
||||
file_env "ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY"
|
||||
file_env "ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT"
|
||||
file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
|
||||
|
||||
{{ if eq (env "OIDC_ENABLED") "true" }}
|
||||
file_env "OIDC_CLIENT_SECRET"
|
||||
{{ end }}
|
||||
|
||||
/usr/bin/tini -s -- "$@"
|
||||
6
entrypoint.main.sh.tmpl
Normal file
6
entrypoint.main.sh.tmpl
Normal file
@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
source entrypoint.common.sh
|
||||
|
||||
/usr/bin/tini -s -- "$@"
|
||||
|
||||
6
entrypoint.streaming.sh.tmpl
Normal file
6
entrypoint.streaming.sh.tmpl
Normal file
@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
source entrypoint.common.sh
|
||||
|
||||
node ./streaming/index.js
|
||||
|
||||
11
release/1.0.0+v4.0.6-hometown-1.1.1
Normal file
11
release/1.0.0+v4.0.6-hometown-1.1.1
Normal file
@ -0,0 +1,11 @@
|
||||
Mastodon 4 requires running pre- and post-deployment migrations, something like
|
||||
|
||||
```
|
||||
abra app run your.app.domain app bash -c "SKIP_POST_DEPLOYMENT_MIGRATIONS=true rails db:migrate"
|
||||
abra app restart your.app.domain app
|
||||
abra app restart your.app.domain streaming
|
||||
abra app restart your.app.domain sidekiq
|
||||
abra app run your.app.domain app rails db:migrate
|
||||
```
|
||||
|
||||
See the full release notes for details: https://github.com/mastodon/mastodon/releases/tag/v4.0.0
|
||||
20
release/3.0.0+v4.5.6-hometown-1.2.0
Normal file
20
release/3.0.0+v4.5.6-hometown-1.2.0
Normal file
@ -0,0 +1,20 @@
|
||||
!!! It is recommended to update to this version before moving on to later updates !!!
|
||||
|
||||
- Redis Namespaces are no longer supported! If you use REDIS_NAMESPACE or CACHE_REDIS_NAMESPACE in your config, you'll have to remove it.
|
||||
|
||||
- Three new secrets have been introduced:
|
||||
* Add the keys to your env:
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY_VERSION=v1
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT_VERSION=v1
|
||||
SECRET_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY_VERSION=v1
|
||||
* Create the keys, e.g. with `abra app secret generate -a your.app.domain`
|
||||
|
||||
- As with every mastodon upgrade, you'll need to migrate databases by running:
|
||||
```
|
||||
abra app run your.app.domain app bash -c "SKIP_POST_DEPLOYMENT_MIGRATIONS=true rails db:migrate"
|
||||
abra app undeploy your.app.domain
|
||||
abra app deploy your.app.domain
|
||||
abra app run your.app.domain app rails db:migrate
|
||||
```
|
||||
|
||||
See the full release notes for details: https://github.com/hometown-fork/hometown/releases/tag/v4.5.6%2Bhometown-1.2.0
|
||||
1
release/3.0.1+v4.5.11-hometown-1.2.1
Normal file
1
release/3.0.1+v4.5.11-hometown-1.2.1
Normal file
@ -0,0 +1 @@
|
||||
No migration necessary, but backing up the database is recommended.
|
||||
Reference in New Issue
Block a user