diff --git a/.env.sample b/.env.sample index 1852238..69f960d 100644 --- a/.env.sample +++ b/.env.sample @@ -27,10 +27,15 @@ SECRET_DB_PASSWORD_VERSION=v1 ########################### GTS_ACCOUNTS_REGISTRATION_OPEN=false +#GTS_ACCOUNTS_REGISTRATION_DAILY_LIMIT=10 +#GTS_ACCOUNTSR_REGISTRATION_BACKLOG_LIMIT=20 + GTS_ACCOUNTS_REASON_REQUIRED=true GTS_ACCOUNTS_APPROVAL_REQUIRED=true + #GTS_ACCOUNTS_ALLOW_CUSTOM_CSS=false #GTS_ACCOUNTS_CUSTOM_CSS_LENGTH=10000 +#GTS_ACCOUNTS_PROFILE_FIELDS=6 ########################### ##### INSTANCE CONFIG ##### diff --git a/abra.sh b/abra.sh index bd67be8..a9781f7 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,6 @@ export ENTRYPOINT_VERSION=v1 export PG_BACKUP_VERSION=v1 -export CONFIG_VERSION=v1 +export CONFIG_VERSION=v2 environment() { if [ -f /run/secrets/oidc_secret ]; then diff --git a/compose.yml b/compose.yml index e63720e..44da2aa 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: app: - image: superseriousbusiness/gotosocial:0.19.2 + image: superseriousbusiness/gotosocial:0.20.1 configs: - source: entrypoint target: /custom-entrypoint.sh @@ -28,7 +28,7 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - - "coop-cloud.${STACK_NAME}.version=0.8.3+0.19.0" + - "coop-cloud.${STACK_NAME}.version=0.9.0+0.20.1" healthcheck: test: wget --no-verbose --tries=1 --spider http://localhost:8080/readyz || exit 1 diff --git a/config.yaml.tmpl b/config.yaml.tmpl index c10d1dd..3b666cd 100644 --- a/config.yaml.tmpl +++ b/config.yaml.tmpl @@ -21,4 +21,9 @@ protocol: "https" bind-address: "0.0.0.0" port: 8080 -trusted-proxies: [172.16.0.0/12, 10.0.0.0/8] +trusted-proxies: + - 172.16.0.0/12 + - 10.0.0.0/8 +advanced-rate-limit-exceptions: + - 10.0.0.0/8 +