Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
infra
ansible-shared
communication
Commits
89ffd71b
Commit
89ffd71b
authored
May 03, 2019
by
Lars Beckers
Browse files
Merge branch 'reapply-fixes' into 'master'
Reapply fixes See merge request
!1
parents
f90eb55d
371d9f5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
dovecot/defaults/main.yml
View file @
89ffd71b
...
...
@@ -29,3 +29,4 @@ dovecot_dsync_host_attribute: ansible_host
dovecot_content_filter
:
false
dovecot_spam_folder
:
Spam
dovecot_spam_user
:
"
${1}"
# debian-spamd
dovecot/tasks/main.yml
View file @
89ffd71b
...
...
@@ -51,7 +51,7 @@
template
:
src
:
"
sieve/{{
item
}}.j2"
dest
:
"
/var/lib/dovecot/sieve.d/{{
item
}}"
mode
:
'
0
55
0'
mode
:
'
0
64
0'
owner
:
dovecot
group
:
"
{{
dovecot_users_group
}}"
with_items
:
...
...
@@ -66,9 +66,28 @@
-
spamassassin
-
mail
-
meta
:
flush_handlers
-
name
:
ensure the global spam filter and learning sieve script have correct permissions
file
:
state
:
file
path
:
"
/var/lib/dovecot/sieve.d/{{
item
}}"
mode
:
'
0640'
owner
:
dovecot
group
:
"
{{
dovecot_users_group
}}"
with_items
:
-
filter-spam.svbin
-
report-spam.svbin
-
report-ham.svbin
when
:
dovecot_content_filter
tags
:
-
dovecot
-
spamassassin
-
mail
-
name
:
ensure scripts for learning spam are present
copy
:
src
:
"
{{
item
}}"
template
:
src
:
"
{{
item
}}
.j2
"
dest
:
"
/var/lib/dovecot/sieve.d/{{
item
}}"
mode
:
'
0750'
owner
:
dovecot
...
...
dovecot/
fil
es/sa-learn-ham.sh
→
dovecot/
templat
es/sa-learn-ham.sh
.j2
View file @
89ffd71b
#!/bin/sh
# you can also use tcp/ip here, consult spamc(1)
exec
/usr/bin/spamc
-u
${
1
}
-L
ham
-C
report
exec
/usr/bin/spamc
-u
{{
dovecot_spam_user
}
}
-L
ham
-C
report
dovecot/
fil
es/sa-learn-spam.sh
→
dovecot/
templat
es/sa-learn-spam.sh
.j2
View file @
89ffd71b
#!/bin/sh
# you can also use tcp/ip here, consult spamc(1)
exec
/usr/bin/spamc
-u
${
1
}
-L
spam
-C
report
exec
/usr/bin/spamc
-u
{{
dovecot_spam_user
}
}
-L
spam
-C
report
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment