dma: Add script that cleans up stale emails in the spool directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/dma/dma-cleanup-spool b/config/dma/dma-cleanup-spool
new file mode 100644 (file)
index 0000000..92af30c
--- /dev/null
+++ b/config/dma/dma-cleanup-spool
@@ -0,0 +1,48 @@
+#!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2015 Michael Tremer <michael.tremer@ipfire.org>               #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+SPOOL_DIR="/var/spool/dma"
+
+find_messages() {
+       find "${SPOOL_DIR}" -type f -name "M*" -mtime +30
+}
+
+remove_message() {
+       local f_message="${1}"
+       local f_queue="${f_message/${SPOOL_DIR}\/M/${SPOOL_DIR}\/Q}"
+
+       # If a message file and a queue file exist, delete both
+       [ -f "${f_message}" ] || return 1
+       [ -f "${f_queue}" ] || return 1
+
+       rm -f "${f_message}" "${f_queue}"
+       return 0
+}
+
+main() {
+       for message in $(find_messages); do
+               remove_message "${message}"
+       done
+
+       return 0
+}
+
+main || exit $?

diff --git a/config/rootfiles/common/dma b/config/rootfiles/common/dma
index 24c365d9133193e45481fda6c7bf9e8c24b71e39..ac575279fac833cedd537ce46dea6448f18c4def 100644 (file)
--- a/config/rootfiles/common/dma
+++ b/config/rootfiles/common/dma
@@ -1,6 +1,7 @@
 etc/alternatives/sendmail
 usr/lib/dma-mbox-create
 usr/sbin/dma
+usr/sbin/dma-cleanup-spool
 usr/sbin/mailq
 usr/sbin/sendmail
 usr/sbin/sendmail.dma

diff --git a/lfs/dma b/lfs/dma
index 4e6150e8a02696b6cc8d7ac5ea82a2cfacd53755..9fe49ab094f22ecf4b72ce1a49aab786082f660b 100644 (file)
--- a/lfs/dma
+++ b/lfs/dma
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install mailq-link install-spool-dirs install-etc
+       install -v -m 755 $(DIR_SRC)/config/dma/dma-cleanup-spool /usr/sbin
        chown -R nobody.nobody /var/ipfire/dma
        chown nobody.root /var/ipfire/dma/auth.conf
        ln -svf dma /usr/sbin/sendmail.dma