move defaults from sample_config.exs to config.exs

diff --git a/config/config.exs b/config/config.exs
index 4f4e2368a4970749910c7910a2516b2c6250b760..9301758f04f38627c7329c25e1b1549511038c56 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -138,7 +138,8 @@ config :pleroma, :instance,
   ],
   finmoji_enabled: true,
   mrf_transparency: true,
-  autofollowed_nicknames: []
+  autofollowed_nicknames: [],
+  max_pinned_statuses: 1
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because

diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex
index 59c2c4fba8df66fd467badc3eed123ab7f4938fd..740b9f8d1da4ae7d50ca252b41b5c717780bd3b8 100644 (file)
--- a/lib/mix/tasks/pleroma/sample_config.eex
+++ b/lib/mix/tasks/pleroma/sample_config.eex
@@ -14,8 +14,7 @@ config :pleroma, :instance,
   email: "<%= email %>",
   limit: 5000,
   registrations_open: true,
-  dedupe_media: false,
-  max_pinned_statuses: 1
+  dedupe_media: false
 
 config :pleroma, :media_proxy,
   enabled: false,