From 0e4632e734efae9029001c72c7536cc00e5abb01 Mon Sep 17 00:00:00 2001 From: r3g_5z Date: Fri, 25 Nov 2022 20:39:03 -0500 Subject: [PATCH 1/4] docs: Tell user to set db password to akkoma for Docker Signed-off-by: r3g_5z --- docs/docs/installation/docker_en.md | 3 ++- lib/pleroma/web/api_spec/operations/twitter_util_operation.ex | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/docs/installation/docker_en.md b/docs/docs/installation/docker_en.md index 64169852f..2a3b3d161 100644 --- a/docs/docs/installation/docker_en.md +++ b/docs/docs/installation/docker_en.md @@ -51,7 +51,8 @@ mkdir pgdata ``` This will ask you a few questions - the defaults are fine for most things, -the database hostname is `db`, and you will want to set the ip to `0.0.0.0`. +the database hostname is `db`, the database password is `akkoma` +(not auto generated), and you will want to set the ip to `0.0.0.0`. Now we'll want to copy over the config it just created diff --git a/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex b/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex index c025867a2..456ab14db 100644 --- a/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex +++ b/lib/pleroma/web/api_spec/operations/twitter_util_operation.ex @@ -81,7 +81,7 @@ def change_password_operation do defp change_password_request do %Schema{ title: "ChangePasswordRequest", - description: "POST body for changing the account's passowrd", + description: "POST body for changing the account's password", type: :object, required: [:password, :new_password, :new_password_confirmation], properties: %{ -- 2.43.0 From 1ae99686836e9707ff85f4a71cbb2d993a2cb6ac Mon Sep 17 00:00:00 2001 From: r3g_5z Date: Fri, 25 Nov 2022 21:30:05 -0500 Subject: [PATCH 2/4] Mention no-referrer too Some users may find it desirable to set no-referrer Signed-off-by: r3g_5z --- docs/docs/configuration/hardening.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/configuration/hardening.md b/docs/docs/configuration/hardening.md index c5a9e160b..bf675c804 100644 --- a/docs/docs/configuration/hardening.md +++ b/docs/docs/configuration/hardening.md @@ -55,7 +55,7 @@ An additional “Strict transport security” header will be sent with the confi > Recommended value: `same-origin` -If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy)) +If you click on a link, your browser’s request to the other site will include from where it is coming from. The “Referrer policy” header tells the browser how and if it should send this information. (see [Referrer policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy)). `no-referrer` can be used if a referrer is not needed for improved privacy. ## systemd -- 2.43.0 From e0b2095a5c908607e112ff30af670699d3b0adc3 Mon Sep 17 00:00:00 2001 From: r3g_5z Date: Fri, 25 Nov 2022 21:39:15 -0500 Subject: [PATCH 3/4] s/pleroma.service/akkoma.service/g Signed-off-by: r3g_5z --- docs/docs/configuration/hardening.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/configuration/hardening.md b/docs/docs/configuration/hardening.md index bf675c804..521183f7d 100644 --- a/docs/docs/configuration/hardening.md +++ b/docs/docs/configuration/hardening.md @@ -59,7 +59,7 @@ If you click on a link, your browser’s request to the other site will include ## systemd -A systemd unit example is provided at `installation/pleroma.service`. +A systemd unit example is provided at `installation/akkoma.service`. ### PrivateTmp -- 2.43.0 From 580afed663c22d2358b1b7972d523505464e0377 Mon Sep 17 00:00:00 2001 From: r3g_5z Date: Fri, 25 Nov 2022 21:59:31 -0500 Subject: [PATCH 4/4] Make MRF rejects log as debug instead of info Signed-off-by: r3g_5z --- lib/pleroma/object/fetcher.ex | 2 +- lib/pleroma/web/activity_pub/activity_pub.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index aafab6643..a9dfa18e7 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -184,7 +184,7 @@ def fetch_object_from_id!(id, options \\ []) do nil {:reject, reason} -> - Logger.info("Rejected #{id} while fetching: #{inspect(reason)}") + Logger.debug("Rejected #{id} while fetching: #{inspect(reason)}") nil e -> diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 3a9b08cf0..76b99025b 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -1674,7 +1674,7 @@ def fetch_and_prepare_user_from_ap_id(ap_id, additional \\ []) do {:error, e} {:error, {:reject, reason} = e} -> - Logger.info("Rejected user #{ap_id}: #{inspect(reason)}") + Logger.debug("Rejected user #{ap_id}: #{inspect(reason)}") {:error, e} {:error, e} -> -- 2.43.0