diff options
| author | lain <lain@soykaf.club> | 2020-07-27 12:34:36 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-27 12:34:36 +0000 |
| commit | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (patch) | |
| tree | be613ab3be331362b94cb1181dd52a8831a2330e /config/config.exs | |
| parent | 64b21cee1417347ddb2a7f7470eb1d7f235ea0ab (diff) | |
| parent | 0d5d1c62efa94ea8fd204dbe4a77073b0374cad4 (diff) | |
| download | pleroma-2a3abfd326f0cbb588dfe66a23e9783be3038a5e.tar.gz pleroma-2a3abfd326f0cbb588dfe66a23e9783be3038a5e.zip | |
Merge branch 'issue/1934-welcome-email' into 'develop'
[#1934] welcome email
See merge request pleroma/pleroma!2786
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 406bf2a9b..acf3b5c96 100644 --- a/config/config.exs +++ b/config/config.exs @@ -225,8 +225,6 @@ config :pleroma, :instance, autofollowed_nicknames: [], max_pinned_statuses: 1, attachment_links: false, - welcome_user_nickname: nil, - welcome_message: nil, max_report_comment_size: 1000, safe_dm_mentions: false, healthcheck: false, @@ -254,6 +252,20 @@ config :pleroma, :instance, ] ] +config :pleroma, :welcome, + direct_message: [ + enabled: false, + sender_nickname: nil, + message: nil + ], + email: [ + enabled: false, + sender: nil, + subject: "Welcome to <%= instance_name %>", + html: "Welcome to <%= instance_name %>", + text: "Welcome to <%= instance_name %>" + ] + config :pleroma, :feed, post_title: %{ max_length: 100, |