Merge pull request #2 from milos85vasic/feature/MSF-3

Feature/msf 3
milos85vasic · Sep 23, 2020 · df9cfb2 · df9cfb2
2 parents 2a33840 + f587543
commit df9cfb2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/Dovecot/Configuration/conf.d/proto.90-quota.conf b/Dovecot/Configuration/conf.d/proto.90-quota.conf
@@ -1,5 +1,6 @@
 
 plugin {
+
   quota_rule = *:storage={{SERVICE.MAIL_RECEIVE.MAILBOXES_CAPACITY}}
   quota_rule1 = INBOX/Trash:storage=1G
   quota_rule2 = INBOX/Archive:storage=+20%%

diff --git a/Dovecot/Utils/proto.quota-warning.sh b/Dovecot/Utils/proto.quota-warning.sh
@@ -3,8 +3,8 @@
 PERCENT=$1
 USER=$2
 
-cat <<EOF | /usr/lib/dovecot/dovecot-lda -d ${USER} -o plugin/quota=maildir
-    From: {{SERVER.POSTMASTER}}
-    Subject: Quota warning
-    Your mailbox is currently ${PERCENT}% full.
-EOF
+echo "From: {{SERVER.POSTMASTER}}
+Subject: Quota warning
+
+Your mailbox is currently $PERCENT% full.
+" | /usr/libexec/dovecot/dovecot-lda -d "${USER}" -o plugin/quota=maildir
diff --git a/Dovecot/proto.receivemail.service b/Dovecot/proto.receivemail.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Dovecot service running on Docker
+After=docker.service
+Requires=docker.service
+
+[Service]
+Restart=always
+ExecStart={{DOCKER.DOCKER_HOME}}/Definitions/Dovecot/start.sh
+
+[Install]
+WantedBy=multi-user.target