diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-27 19:35:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-27 19:35:06 +0000 |
| commit | cff0292d4b32cf51de8ad15281c35d783b137dd2 (patch) | |
| tree | cbe9546e4f4aa76165818157b688d25e66bae66a /config | |
| parent | 02866a42afde69f40724648757f6bdaab5a66d17 (diff) | |
| parent | 1dd71026a1acd29e560f059d36f37ea70001bedb (diff) | |
| download | pleroma-cff0292d4b32cf51de8ad15281c35d783b137dd2.tar.gz pleroma-cff0292d4b32cf51de8ad15281c35d783b137dd2.zip | |
Merge branch 'reserve-user-names' into 'develop'
Reserve a few user names
See merge request pleroma/pleroma!594
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 4b8762761..1983b31ab 100644 --- a/config/config.exs +++ b/config/config.exs @@ -137,8 +137,8 @@ config :pleroma, :fe, logo_mask: true, logo_margin: "0.1em", background: "/static/aurora_borealis.jpg", - redirect_root_no_login: "/~/main/all", - redirect_root_login: "/~/main/friends", + redirect_root_no_login: "/main/all", + redirect_root_login: "/main/friends", show_instance_panel: true, scope_options_enabled: false, formatting_options_enabled: false, @@ -220,6 +220,37 @@ config :cors_plug, credentials: true, headers: ["Authorization", "Content-Type", "Idempotency-Key"] +config :pleroma, Pleroma.User, + restricted_nicknames: [ + "about", + "~", + "main", + "users", + "settings", + "objects", + "activities", + "web", + "registration", + "friend-requests", + "pleroma", + "api", + "tag", + "notice", + "status", + "user-search", + "ostatus_subscribe", + "oauth", + "push", + "relay", + "inbox", + ".well-known", + "nodeinfo", + "auth", + "proxy", + "dev", + "internal" + ] + # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |