summaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-04-25 16:35:48 -0400
committerJesse Luehrs <doy@tozt.net>2020-04-25 16:35:48 -0400
commitb92759587be6080b3205e1f04629dcef56c53f54 (patch)
treef8e8ff8b9c849a132152853cbdf7a4b5ad90cb3b /modules/mail
parentc24974dc397a1a5ac8cb7612aef596443e4d8542 (diff)
downloadpuppet-tozt-b92759587be6080b3205e1f04629dcef56c53f54.tar.gz
puppet-tozt-b92759587be6080b3205e1f04629dcef56c53f54.zip
fix container-relative paths
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/files/learn_spam20
1 files changed, 12 insertions, 8 deletions
diff --git a/modules/mail/files/learn_spam b/modules/mail/files/learn_spam
index 5bdbd0d..5732ab9 100644
--- a/modules/mail/files/learn_spam
+++ b/modules/mail/files/learn_spam
@@ -3,22 +3,26 @@ set -eu
set -o pipefail
cd /media/persistent
-mkdir -p tmp
-dir=$(mktemp -d -p /media/persistent/tmp learnspam.XXXXXXXX)
+mkdir -p mail/tmp
+dir=$(mktemp -d -p /media/persistent/mail/tmp learnspam.XXXXXXXX)
trap 'rm -rf $dir' EXIT
ham="${dir}/ham"
spam="${dir}/spam"
mkdir "$ham" "$spam"
+container_dir="${dir#/media/persistent}"
+container_ham="${container_dir}/ham"
+container_spam="${container_dir}/spam"
+
find /media/persistent/mail -type f -mtime -90 | grep /cur/ | grep -v Sent | grep -v Junk | xargs -i ln {} "${dir}/ham"
find /media/persistent/mail -type f -mtime -90 | grep /cur/ | grep -v Sent | grep Junk | xargs -i ln {} "${dir}/spam"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_ham "$ham"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_spam "$spam"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_ham "$container_ham"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu learn_spam "$container_spam"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_add "$ham"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_del "$ham"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_add "$container_ham"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_del "$container_ham"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_add "$spam"
-docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_del "$spam"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 11 fuzzy_add "$container_spam"
+docker-compose exec imap rspamc -h antispam:11334 -P mailu -f 13 fuzzy_del "$container_spam"