From 449d53fc3f8fd7e2be829dc24ea63d0ce3c86b70 Mon Sep 17 00:00:00 2001
From: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sun, 23 Apr 2023 15:14:36 +0200
Subject: [PATCH] docs/scripts: remove WIP warnings for Rspamd (#3283)

---
 docs/content/config/environment.md                | 6 +-----
 docs/content/config/security/rspamd.md            | 6 ------
 target/scripts/startup/setup.d/security/rspamd.sh | 5 ++---
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/docs/content/config/environment.md b/docs/content/config/environment.md
index bea6b93b..a681ef32 100644
--- a/docs/content/config/environment.md
+++ b/docs/content/config/environment.md
@@ -313,11 +313,7 @@ will be automatically moved to the Junk folder (with the help of a Sieve script)
 
 ##### ENABLE_RSPAMD
 
-Enable or disable Rspamd.
-
-!!! warning "Current State"
-
-    Rspamd-support is under active development. Be aware that changes can happen at any time. To get more information, see [the detailed documentation page for Rspamd][docs-rspamd].
+Enable or disable [Rspamd][docs-rspamd].
 
 - **0** => disabled
 - 1 => enabled
diff --git a/docs/content/config/security/rspamd.md b/docs/content/config/security/rspamd.md
index f017ca7f..ba3b6d8a 100644
--- a/docs/content/config/security/rspamd.md
+++ b/docs/content/config/security/rspamd.md
@@ -2,12 +2,6 @@
 title: 'Security | Rspamd'
 ---
 
-!!! warning "The current state of Rspamd integration into DMS"
-
-    Recent pull requests have stabilized integration of Rspamd to a point that we encourage users to test the feature. We are confident that there are no major bugs in our integration that make using Rspamd infeasible. Please note that there may still be changes ahead as integration is still work in progress!
-
-    We expect to stabilize this feature with version `v12.1.0`.
-
 ## About
 
 Rspamd is a ["fast, free and open-source spam filtering system"][rspamd-homepage]. DMS integrates Rspamd like any other service. We provide a very simple but easy to maintain setup of Rspamd.
diff --git a/target/scripts/startup/setup.d/security/rspamd.sh b/target/scripts/startup/setup.d/security/rspamd.sh
index cee7c2a9..1daf0188 100644
--- a/target/scripts/startup/setup.d/security/rspamd.sh
+++ b/target/scripts/startup/setup.d/security/rspamd.sh
@@ -5,11 +5,10 @@ function _setup_rspamd
 {
   if _env_var_expect_zero_or_one 'ENABLE_RSPAMD' && [[ ${ENABLE_RSPAMD} -eq 1 ]]
   then
-    _log 'warn' 'Rspamd integration is work in progress - expect changes at any time'
     _log 'debug' 'Enabling and configuring Rspamd'
     __rspamd__log 'trace' '----------  Setup started  ----------'
 
-    __rspamd__run_early_setup_and_checks        # must run first
+    __rspamd__run_early_setup_and_checks      # must run first
     __rspamd__setup_redis
     __rspamd__setup_postfix
     __rspamd__setup_clamav
@@ -17,7 +16,7 @@ function _setup_rspamd
     __rspamd__setup_learning
     __rspamd__setup_greylisting
     __rspamd__setup_hfilter_group
-    __rspamd__handle_user_modules_adjustments   # must run last
+    __rspamd__handle_user_modules_adjustments # must run last
 
     __rspamd__log 'trace' '----------  Setup finished  ----------'
   else