From 91724d160acc39585c37742204c59b91e59df569 Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 25 Dec 2018 20:09:27 +0100 Subject: Reserve a few user names These are all names that are used for domain.com/:route routes or projected to be. --- config/config.exs | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 4b8762761..980c215c8 100644 --- a/config/config.exs +++ b/config/config.exs @@ -220,6 +220,35 @@ config :cors_plug, credentials: true, headers: ["Authorization", "Content-Type", "Idempotency-Key"] +config :pleroma, Pleroma.User, + restricted_nicknames: [ + "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" -- cgit v1.2.3 From 5811e65e67591b06238de66470c03744e0d83e2d Mon Sep 17 00:00:00 2001 From: lain Date: Wed, 26 Dec 2018 12:39:35 +0100 Subject: Add some hard limits on inserted activities. --- config/config.exs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 4b8762761..82e7d8121 100644 --- a/config/config.exs +++ b/config/config.exs @@ -98,7 +98,8 @@ config :pleroma, :instance, name: "Pleroma", email: "example@example.com", description: "A Pleroma instance, an alternative fediverse server", - limit: 5000, + limit: 5_000, + remote_limit: 10_000, upload_limit: 16_000_000, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, -- cgit v1.2.3 From 8da2c45c279e33c75f283013f6dfc63231571bd3 Mon Sep 17 00:00:00 2001 From: lain Date: Wed, 26 Dec 2018 14:16:41 +0100 Subject: Add ~ to the list of restricted names. --- config/config.exs | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 980c215c8..bec24f9a0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -222,6 +222,7 @@ config :cors_plug, config :pleroma, Pleroma.User, restricted_nicknames: [ + "~", "main", "users", "settings", -- cgit v1.2.3 From 1dd71026a1acd29e560f059d36f37ea70001bedb Mon Sep 17 00:00:00 2001 From: lain Date: Wed, 26 Dec 2018 14:51:51 +0100 Subject: Add 'about' to restricted list. And correct pleromaFE config. --- config/config.exs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index bec24f9a0..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, @@ -222,6 +222,7 @@ config :cors_plug, config :pleroma, Pleroma.User, restricted_nicknames: [ + "about", "~", "main", "users", -- cgit v1.2.3 From 9c782e59ddac5fa01cd5b2517f282b283f01bc1d Mon Sep 17 00:00:00 2001 From: lambda Date: Fri, 28 Dec 2018 18:57:50 +0000 Subject: Raise remote limit --- config/config.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/config.exs b/config/config.exs index 82e7d8121..d59aa278e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -99,7 +99,7 @@ config :pleroma, :instance, email: "example@example.com", description: "A Pleroma instance, an alternative fediverse server", limit: 5_000, - remote_limit: 10_000, + remote_limit: 100_000, upload_limit: 16_000_000, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, -- cgit v1.2.3