From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] BUG10955: Add dma-cleanup-spool script to dma
Date: Thu, 12 Nov 2015 11:07:34 +0000
Message-ID: <1447326454.2699.113.camel@ipfire.org>
In-Reply-To: <1447244643-3107-1-git-send-email-alexander.marx@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6596291784990183580=="
List-Id: <development.lists.ipfire.org>

--===============6596291784990183580==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Thank you. Very well done. Merged.

-Michael

On Wed, 2015-11-11 at 13:24 +0100, Alexander Marx wrote:
> This file cleans up the spool directory from DMA Mailservice after
> defined period of time
> Otherwise the spool dir may be flooded
> 
> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> ---
>  dma/dma-cleanup-spool | 48
> ++++++++++++++++++++++++++++++++++++++++++++++++
>  dma/dma.nm            |  4 ++++
>  2 files changed, 52 insertions(+)
>  create mode 100644 dma/dma-cleanup-spool
> 
> diff --git a/dma/dma-cleanup-spool b/dma/dma-cleanup-spool
> new file mode 100644
> index 0000000..92af30c
> --- /dev/null
> +++ b/dma/dma-cleanup-spool
> @@ -0,0 +1,48 @@
> +#!/bin/bash
> +####################################################################
> ###########
> +#                                                                   
>           #
> +# IPFire.org - A linux based firewall                               
>           #
> +# Copyright (C) 2015 Michael Tremer <michael.tremer(a)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/dma/dma.nm b/dma/dma.nm
> index 79fe021..259421a 100644
> --- a/dma/dma.nm
> +++ b/dma/dma.nm
> @@ -35,6 +35,10 @@ build
>  
>  	make_install_targets += PREFIX=%{prefix} \
>  		sendmail-link mailq-link install-spool-dirs install
> -etc
> +
> +	install_cmds
> +		install -m 755 %{DIR_SOURCE}/dma-cleanup-spool
> %{BUILDROOT}%{sbindir}
> +	end
>  end
>  
>  packages

--===============6596291784990183580==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSldSSEwyQUFvSkVJQjU4UDl2a0FrSGJRVVFBTEN0NENNWHBTdzFLTFI1MmpJTmkza2kK
NHQzdmZ3ZFp4dkNMZURWd3EveVdhMFNzUlJad3lhZGdkdlJ6V1kwakN0R3Joa0FHTTRka1IyakpG
bzVQb0VBNwo1TEs2VlE5Wkh5cDBKYjRnbzdDTVpDWnUxUDVubENlWk5lRUlROGw4NVVuemh6czJw
UjhtVDFmSFEreUhFenRBCnY3RjBlWE42eG12NHpxeS9jMmRjQUc2cW8xRjdpbU8xNkE5NU5CSHUz
MGxHaGJzMDJSR3FPTXdpOUV0dUpkSzQKT0M5YzRJNW0zM1lzbGxEcnJCMkp5dVBSS2dRNmx6RkFR
L2dnMnJVSEg2QkxYTDBVMjFjdlJIMlkwUUR3SHB5TQpMQWJKNWZDZ2E1SlU5N0xQMFdwOHM3K1Zu
MXllWlpFT0lTaGVvUGVlTlNpMTFSRWREZzRCR3Y1N1BUanVvOU8rCmpRY2VNTS9JaWl1ODI0YmZH
aU1Hc09TRW00YWxnbnlucmVEeXoyLytLU3p5eFk2TFVWWXFyL1ZXQTd4VVBvWGoKOUVNSmNwT3Y0
RXl2dlYyUUdSd0hSUjl4NGJ5NXNBN0YxQlk2V1Iwd1VuQThEWHJwSUUrckdKVlJ0SzdnSnVvSQpk
N1VHbDlwZnI3R3MwT3lieGtEUkh2MnIycG5wL29IbzkrMFRiNmFLKytmR1VkSFlPY1J4NitJNE9B
a1Ywd3dXCitLZktYcGZyc2RyRWl2UDVjdi9wOFRkeDlCV2tOS1dxSTZkY016TDZXMFQzbldFMGFL
NUpzMjlUSDV0R0RNVU4KYTk5TVFaRXRjV01hcjd0bzRMeHVxSzJxZjJmUEpWMmV5dUN3UE1Bdndz
dG9GK0JqR1p1WDVFV1hGaFlZVUlxZgovMWhPYjV1RW8wdDVwQ25hMk5nTQo9VWcreAotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============6596291784990183580==--