From a2dfa70a29f084193ff79801af1d5eb568be06f3 Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Fri, 22 Sep 2017 13:31:02 +0200
Subject: [PATCH 1/2] Rspamd configuration customization

---
 docs/firststeps-rspamd_ui.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/firststeps-rspamd_ui.md b/docs/firststeps-rspamd_ui.md
index 39cca4cd3..402beee00 100644
--- a/docs/firststeps-rspamd_ui.md
+++ b/docs/firststeps-rspamd_ui.md
@@ -5,7 +5,7 @@ At first you may want to setup Rspamds web interface which provides some useful
 docker-compose exec rspamd-mailcow rspamadm pw
 ```
 
-2\. Replace the default hash in `data/conf/rspamd/override.d/worker-controller.inc` by your newly generated:
+2\. Save your newly-generated hash by adding the following line to `data/conf/rspamd/override.d/worker-controller.custom.inc`:
 ```
 enable_password = "myhash";
 ```

From d3826ca15b005040cd88408047b4d98a03c67ec0 Mon Sep 17 00:00:00 2001
From: Michael Kuron <mkuron@users.noreply.github.com>
Date: Sun, 14 Jan 2018 12:33:36 +0100
Subject: [PATCH 2/2] rspamd UI password configurable via web interface now

---
 docs/firststeps-rspamd_ui.md | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/docs/firststeps-rspamd_ui.md b/docs/firststeps-rspamd_ui.md
index 402beee00..1d2cc4479 100644
--- a/docs/firststeps-rspamd_ui.md
+++ b/docs/firststeps-rspamd_ui.md
@@ -1,20 +1,3 @@
-At first you may want to setup Rspamds web interface which provides some useful features and information.
-
-1\. Generate a Rspamd controller password hash:
-```
-docker-compose exec rspamd-mailcow rspamadm pw
-```
-
-2\. Save your newly-generated hash by adding the following line to `data/conf/rspamd/override.d/worker-controller.custom.inc`:
-```
-enable_password = "myhash";
-```
-
-You can use `password = "myhash";` instead of `enable_password` to disable write-access in the web UI.
-
-3\. Restart rspamd:
-```
-docker-compose restart rspamd-mailcow
-```
-
-Open https://${MAILCOW_HOSTNAME}/rspamd in a browser and login!
+At first you may want to set up Rspamd's web interface, which provides some useful features and information.
+In the Mailcow web admin interface, go to the Debug page and set the Rspamd UI password.
+Then open https://${MAILCOW_HOSTNAME}/rspamd in a browser and log in!