diff --git a/conf/install_update_dovecot.conf.sample b/conf/install_update_dovecot.conf.sample index da6debc..4cd214d 100644 --- a/conf/install_update_dovecot.conf.sample +++ b/conf/install_update_dovecot.conf.sample @@ -98,15 +98,15 @@ auth_mechanisms="plain login" # - Settings for quota warning sript # - -from_address="warenform gbr " -reply_to="hilfe@kunden.warenform.net" -webmailer="https:\\webmail.initiativenserver.de" -salutation="Das WARENFORM-Team -# -#-- -#WARENFORM | Phone: +49 30 / 61 65 17 52 -0 -#Dresdner Str. 11 | Fax: +49 30 / 61 65 17 52 -66 -#D-10999 Berlin | http://www.warenform.net" +from_address="o.open " +reply_to="oo@oopen.de" +webmailer="https://webmail.oopen.de" +salutation="O.OPEN + +-- +O.OPEN | Phone: +49 30 / 290 484 91 +Erkelenzdamm 21 | Fax: +49 30 / 290 484 99 +D-10999 Berlin | http://oopen.de" # --- # --- End server-specific Settings diff --git a/install_update_dovecot.sh b/install_update_dovecot.sh index 2ad0007..769fdca 100755 --- a/install_update_dovecot.sh +++ b/install_update_dovecot.sh @@ -2594,9 +2594,10 @@ fi ## - ## - service quota-warning { ## - executable = script /usr/local/bin/quota-warning.sh -## - user = dovecot +## - user = vmail ## - unix_listener quota-warning { ## - user = vmail +## - mode = 0666 ## - } ## - } ## - @@ -2619,9 +2620,10 @@ plugin { service quota-warning { executable = script /usr/local/bin/quota-warning.sh - user = dovecot + user = vmail unix_listener quota-warning { user = vmail + mode = 0666 } } EOF @@ -2639,7 +2641,7 @@ if $_new ; then ## - create the user-warning script ## - cat </usr/local/bin/quota-warning.sh -#!/bin/sh +#!/usr/bin/env bash # author: zhang huangbin # purpose: send mail to notify user when his mailbox quota exceeds a @@ -2651,7 +2653,7 @@ LANG=en_US.UTF-8 percent=\$1 user=\$2 -cat << EOF | /usr/local/dovecot/libexec/dovecot/deliver -d \${user} -c /usr/local/dovecot/etc/dovecot/dovecot.conf +cat << EOF | /usr/local/dovecot/libexec/dovecot/deliver -d \${user} -c /usr/local/dovecot/etc/dovecot/dovecot.conf -o "plugin/quota=dict:User quota::noenforcing:proxy::quota" date: \`date +"%a, %e %b %Y %H:%M:%S %z"\` from: $from_address reply-to: $reply_to