From 0ba9a39b0f0e932508db02078589b6192776c6d0 Mon Sep 17 00:00:00 2001
From: Aaron Guise <aaron@guise.net.nz>
Date: Fri, 1 Dec 2023 16:27:11 +1300
Subject: [PATCH] Set spam folder to "Junk"

---
 files/directadmin/scripts/custom/user_create_post.sh | 2 +-
 tasks/config/directadmin.yml                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/directadmin/scripts/custom/user_create_post.sh b/files/directadmin/scripts/custom/user_create_post.sh
index e4f0faa..94a00bf 100755
--- a/files/directadmin/scripts/custom/user_create_post.sh
+++ b/files/directadmin/scripts/custom/user_create_post.sh
@@ -21,7 +21,7 @@ if [ "$spam" = "ON" ]; then
      if [ ! -s ${FCONF} ]; then
         echo 'high_score=15' > ${FCONF}
         echo 'high_score_block=no' >> ${FCONF}
-        echo 'where=inbox' >> ${FCONF}
+        echo 'where=userspamfolder' >> ${FCONF}
         chown mail:mail ${FCONF}
 
         echo "action=rewrite&value=filter&user=$username" >> /usr/local/directadmin/data/task.queue
diff --git a/tasks/config/directadmin.yml b/tasks/config/directadmin.yml
index 5940175..c8f64eb 100644
--- a/tasks/config/directadmin.yml
+++ b/tasks/config/directadmin.yml
@@ -37,8 +37,8 @@
   loop:
     - name: Don't Prefix Spam under INBOX
       option: spam_inbox_prefix
-      value: 0
-    - name: Set Spam prefix
+      value: 1
+    - name: Set Spam prefix to Junk
       option: spam_inbox_prefix_name
       value: Junk
   loop_control: