From 08925394f00a5c1ead8e4353ddea3531699231d6 Mon Sep 17 00:00:00 2001
From: sn0w <sn0w@posteo.de>
Date: Mon, 9 Apr 2018 01:01:43 +0200
Subject: [PATCH] Revert the upload option

---
 .env.dist         | 4 ----
 docker-compose.m4 | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.env.dist b/.env.dist
index 1c7a36c..2e21c5d 100644
--- a/.env.dist
+++ b/.env.dist
@@ -49,9 +49,5 @@ PLEROMA_MEDIA_PROXY_URL=
 # DB
 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
 PLEROMA_CHAT_ENABLED=
diff --git a/docker-compose.m4 b/docker-compose.m4
index 80b7b49..52306f2 100644
--- a/docker-compose.m4
+++ b/docker-compose.m4
@@ -36,6 +36,8 @@ services:
     links:
       - db
     environment:
+      env_fb(`mix_env', `prod')
+
       env_fb(`postgres_ip', `db')
       env(`postgres_db')
       env(`postgres_user')
@@ -53,13 +55,11 @@ services:
       env(`pleroma_media_proxy_redirect_on_failure')
       env(`pleroma_media_proxy_url')
       env(`pleroma_db_pool_size')
-      env(`pleroma_uploads_path')
+      env_fb(`pleroma_uploads_path', `/uploads')
       env(`pleroma_chat_enabled')
-
-      env_fb(`mix_env', `prod')
     volumes:
       - ./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:
       traefik.enable: "true"
       traefik.fe.port: "4000"