ehlxr/pleroma-docker
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert the upload option

Browse Source
This commit is contained in:
sn0w 2018-04-09 01:01:43 +02:00
parent 210c7608be
commit 08925394f0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.dist
View File

@ -49,9 +49,5 @@ PLEROMA_MEDIA_PROXY_URL=
# DB # DB
PLEROMA_DB_POOL_SIZE= PLEROMA_DB_POOL_SIZE=
# Where to store uploaded content
# (This path is relative to your $DOCKER_DATADIR)
PLEROMA_UPLOADS_PATH=
# Whether to enable the chat feature or not # Whether to enable the chat feature or not
PLEROMA_CHAT_ENABLED= PLEROMA_CHAT_ENABLED=

8
docker-compose.m4
View File

@ -36,6 +36,8 @@ services:
links: links:
- db - db
environment: environment:
env_fb(`mix_env', `prod')
env_fb(`postgres_ip', `db') env_fb(`postgres_ip', `db')
env(`postgres_db') env(`postgres_db')
env(`postgres_user') env(`postgres_user')
@ -53,13 +55,11 @@ 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_fb(`pleroma_uploads_path', `/uploads')
env(`pleroma_chat_enabled') env(`pleroma_chat_enabled')
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') - env_inline(`docker_datadir')/uploads:env_inline_fb(`pleroma_uploads_path', `/uploads')
labels: labels:
traefik.enable: "true" traefik.enable: "true"
traefik.fe.port: "4000" traefik.fe.port: "4000"