From daf8eeebc0055dbb35b9e4ac1e9aa4fffece4a53 Mon Sep 17 00:00:00 2001
From: sn0w <sn0w@posteo.de>
Date: Mon, 26 Aug 2019 00:28:14 +0200
Subject: [PATCH] Update config sample

---
 Dockerfile      |  2 +-
 config.dist.exs | 48 ++++++++++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f5e33e7..3a5f9ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG MIX_ENV
 ENV MIX_ENV=$MIX_ENV
 
 # Prepare mounts
-VOLUME /custom.d
+VOLUME /custom.d /uploads
 
 # Expose HTTP, Gopher, and SSH ports, respectively
 EXPOSE 4000 9999 2222
diff --git a/config.dist.exs b/config.dist.exs
index 803a033..49957f4 100644
--- a/config.dist.exs
+++ b/config.dist.exs
@@ -1,14 +1,14 @@
 use Mix.Config
 
-# Listening to 0.0.0.0 is required in a container since the IP is not known in advance.
 # You should not change the following three ip/port mappings.
+# Listening to 0.0.0.0 is required in a container since the IP is not known in advance.
 # Instead, change the mapping to your host ports in "docker-compose.yml".
 
 config :pleroma, Pleroma.Web.Endpoint,
-    http: [
-      ip: {0, 0, 0, 0},
-      port: 4000
-    ]
+  http: [
+    ip: {0, 0, 0, 0},
+    port: 4000
+  ]
 
 config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
@@ -17,35 +17,47 @@ config :pleroma, :gopher,
 config :esshd,
   port: 2222
 
+# You shouldn't need to change this.
 # pleroma/pleroma/pleroma are the default credentials.
 # "db" is the default interlinked hostname.
-# You shouldn't need to change this.
 config :pleroma, Pleroma.Repo,
-    adapter: Ecto.Adapters.Postgres,
-    username: "pleroma",
-    password: "pleroma",
-    database: "pleroma",
-    hostname: "db"
+  adapter: Ecto.Adapters.Postgres,
+  username: "pleroma",
+  password: "pleroma",
+  database: "pleroma",
+  hostname: "db"
+
+# You should not change this.
+config :pleroma, Pleroma.Uploaders.Local, uploads: "/uploads"
 
 #
 # vvv Your awesome config options go here vvv
 #
 
+config :pleroma, Pleroma.Upload,
+  filters: [Pleroma.Upload.Filter.Dedupe, Pleroma.Upload.Filter.Mogrify]
+
+config :pleroma, Pleroma.Upload.Filter.Mogrify,
+  args: ["strip"]
+
+# Set your URL and key-base here
+# On Linux, you can use the following command to get a random key base:
+# dd if=/dev/urandom bs=1 count=128 2>/dev/null | base64 -w 0 | rev | cut -b 2- | rev
+config :pleroma, Pleroma.Web.Endpoint,
+  url: [host: "ihatedocker.io", scheme: "https", port: 443],
+  secret_key_base: "<key>"
+
 ###
-# Here are some example values.
-# Uncomment what you need or delete it all.
+# Now follow some example config values.
+# Uncomment/Change what you need, or delete it all.
 #
 # Want to use pleroma's config generator instead?
-# Try `./pleroma mix pleroma.instance gen` and then `./pleroma cp /home/pleroma/pleroma/config/generated_config.exs config.exs`.
+# Try `./pleroma.sh mix pleroma.instance gen` and then `./pleroma.sh cp /home/pleroma/pleroma/config/generated_config.exs config.exs`.
 #
 # Need some inspiration?
 # Take a look at https://git.pleroma.social/pleroma/pleroma/tree/develop/config
 ###
 
-# config :pleroma, Pleroma.Web.Endpoint,
-#   url: [host: "example.com", scheme: "https", port: 443],
-#   secret_key_base: "<key>"
-
 # config :pleroma, :instance,
 #   name: "example instance",
 #   email: "example@example.com",