Add new config options

This commit is contained in:
sn0w 2018-04-09 00:33:52 +02:00
parent 99f9c49151
commit 7e0a5a8904
4 changed files with 31 additions and 15 deletions

View File

@ -48,3 +48,10 @@ PLEROMA_MEDIA_PROXY_URL=
# DB # DB
PLEROMA_DB_POOL_SIZE= PLEROMA_DB_POOL_SIZE=
# Where to store uploaded content
# Can be a relative path, "~/...", or absolute.
PLEROMA_UPLOADS_PATH=
# Whether to enable the chat feature or not
PLEROMA_CHAT_ENABLED=

View File

@ -58,7 +58,7 @@ Here are a few customization examples:
- Save them in `custom.d/priv/static/emoji`. Then create and/or edit `custom.d/config/custom_emoji.txt`. - Save them in `custom.d/priv/static/emoji`. Then create and/or edit `custom.d/config/custom_emoji.txt`.
- I want custom ToS - I want custom ToS
- Throw a HTML document to `priv/static/static/terms-of-service.html` - Throw a HTML document to `custom.d/priv/static/static/terms-of-service.html`
You get the gist.<br> You get the gist.<br>
Pretty basic stuff. Pretty basic stuff.

View File

@ -53,17 +53,20 @@ services:
env(`pleroma_media_proxy_redirect_on_failure') env(`pleroma_media_proxy_redirect_on_failure')
env(`pleroma_media_proxy_url') env(`pleroma_media_proxy_url')
env(`pleroma_db_pool_size') env(`pleroma_db_pool_size')
env(`pleroma_uploads_path')
env(`pleroma_chat_enabled')
env_fb(`mix_env', `prod') env_fb(`mix_env', `prod')
volumes: volumes:
- ./custom.d:/custom.d - ./custom.d:/custom.d
- env_inline(`docker_datadir')/uploads:env_inline(`pleroma_uploads_path')
labels: labels:
traefik.enable: "true" traefik.enable: "true"
traefik.fe.port: "4000" traefik.fe.port: "4000"
traefik.fe.protocol: "http" traefik.fe.protocol: "http"
traefik.fe.entryPoints: "http,https" traefik.fe.entryPoints: "http,https"
traefik.fe.frontend.rule: "Host:env_inline(`pleroma_url')" traefik.fe.frontend.rule: "Host:env_inline(`pleroma_url')"
traefik.cache.port: "80" traefik.cache.port: "4000"
traefik.cache.protocol: "http" traefik.cache.protocol: "http"
traefik.cache.entryPoints: "http,https" traefik.cache.entryPoints: "http,https"
traefik.cache.frontend.rule: "Host:env_inline(`pleroma_media_proxy_url')" traefik.cache.frontend.rule: "Host:env_inline(`pleroma_media_proxy_url')"

View File

@ -22,6 +22,12 @@ config :pleroma, Pleroma.Web.Endpoint,
], ],
secret_key_base: Docker.env(:secret_key_base) secret_key_base: Docker.env(:secret_key_base)
config :pleroma, Pleroma.Upload,
uploads: Docker.env(:uploads_path)
config :pleroma, :chat,
enabled: Docker.env(:chat_enabled)
config :pleroma, :instance, config :pleroma, :instance,
name: Docker.env(:name), name: Docker.env(:name),
email: Docker.env(:admin_email), email: Docker.env(:admin_email),