mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2024-01-19 02:48:50 +00:00
Fixes #507 - Permission check on Amavis lib folder, and bring back to amavis:amavis if needed (#513)
This commit is contained in:
parent
8cf4f839ee
commit
ef59fae8b3
|
@ -902,7 +902,7 @@ function fix() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function _fix_var_mail_permissions() {
|
function _fix_var_mail_permissions() {
|
||||||
notify 'task' 'Fixing /var/mail permissions'
|
notify 'task' 'Checking /var/mail permissions'
|
||||||
|
|
||||||
# Fix permissions, but skip this if 3 levels deep the user id is already set
|
# Fix permissions, but skip this if 3 levels deep the user id is already set
|
||||||
if [ `find /var/mail -maxdepth 3 -a \( \! -user 5000 -o \! -group 5000 \) | grep -c .` != 0 ]; then
|
if [ `find /var/mail -maxdepth 3 -a \( \! -user 5000 -o \! -group 5000 \) | grep -c .` != 0 ]; then
|
||||||
|
@ -915,13 +915,20 @@ function _fix_var_mail_permissions() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function _fix_var_amavis_permissions() {
|
function _fix_var_amavis_permissions() {
|
||||||
notify 'task' 'Fixing /var/lib/amavis permissions'
|
if [ "$ONE_DIR" -eq 0 ]; then
|
||||||
|
amavis_state_dir=/var/lib/amavis
|
||||||
if [ `find /var/lib/amavis/* -maxdepth 3 -a \( \! -user amavis -o \! -group amavis \) | grep -c .` != 0 ]; then
|
|
||||||
notify 'inf' "Fixing /var/lib/amavis permissions"
|
|
||||||
chown -R amavis:amavis /var/lib/amavis
|
|
||||||
else
|
else
|
||||||
notify 'inf' "Permissions in /var/lib/amavis look OK"
|
amavis_state_dir=/var/mail-state/lib-amavis
|
||||||
|
fi
|
||||||
|
notify 'task' 'Checking $amavis_state_dir permissions'
|
||||||
|
|
||||||
|
amavis_permissions_status=$(find -H $amavis_state_dir -maxdepth 3 -a \( \! -user amavis -o \! -group amavis \))
|
||||||
|
|
||||||
|
if [ -n "$amavis_permissions_status" ]; then
|
||||||
|
notify 'inf' "Fixing $amavis_state_dir permissions"
|
||||||
|
chown -hR amavis:amavis $amavis_state_dir
|
||||||
|
else
|
||||||
|
notify 'inf' "Permissions in $amavis_state_dir look OK"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue