X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=d234d23ebcb59ab5de1bf2dd9973f6076534ae00;hb=e95d958b525cd0a448d38753099bbf7a4f30ba90;hp=6b1e31398cdba486a2e70b6a37e320d06d3cf0ec;hpb=c9e4c45e0e381eb0293588f65c49212e3573161a;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 6b1e31398..d234d23eb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -12,7 +12,9 @@ config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
 
 config :pleroma, Pleroma.Upload,
   uploads: "uploads",
-  strip_exif: false
+  strip_exif: false,
+  use_s3: false,
+  s3_bucket: nil
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 
@@ -61,6 +63,7 @@ config :pleroma, :instance,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
+  allow_relay: true,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
   quarantined_instances: []