From: Dessalines <tyhou13@gmx.com>
Date: Tue, 31 Jan 2023 17:21:34 +0000 (-0500)
Subject: Merge branch 'main' of https://github.com/LemmyNet/lemmy
X-Git-Url: http://these/git/?a=commitdiff_plain;h=41010328c133e0a3c3f098c4a444d08c26104b81;hp=36ac1b54c1b50bf842d756496e732a90ba4dc4f5;p=lemmy.git

Merge branch 'main' of https://github.com/LemmyNet/lemmy
---

diff --git a/RELEASES.md b/RELEASES.md
index bca0f01b..6aba9842 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -70,7 +70,7 @@ Next, **manually edit** your [lemmy.hjson](https://github.com/LemmyNet/lemmy/blo
       # api_key: "API_KEY"
   }
   ```
-- The `rate_limit` block should be removed, as that is now in the database, and can be updated through the UI.
+- The `rate_limit`, `federation`, `captcha`, and `slur_filter` blocks should be removed, as they are now in the database, and can be updated through the UI.
 - The site setup has removed a few fields.
 - See the link above for every setting.
 
@@ -80,6 +80,13 @@ The `image` lines should look like:
 
 - `image: dessalines/lemmy:0.17.0` for lemmy
 - `image: dessalines/lemmy-ui:0.17.0` for lemmy-ui
+- The `lemmy-ui` environment should now look like:
+  ```
+    environment:
+      - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy:8536
+      - LEMMY_UI_LEMMY_EXTERNAL_HOST={{ domain }}
+      - LEMMY_UI_HTTPS=true
+  ```
 - You can always find the latest version [here](https://github.com/LemmyNet/lemmy-ansible/blob/main/VERSION).
 - Ensure that postgres is `postgres:15-alpine` (the upgrade script above should have already set this correctly)