conf/57517: add parameter for /etc/periodic/daily/210.backup-aliases in /etc/defaults/periodic.conf

[Krzysztof Stryjek]

>Number:         57517
>Category:       conf
>Synopsis:       add parameter for /etc/periodic/daily/210.backup-aliases in /etc/defaults/periodic.conf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 02 16:10:12 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Krzysztof Stryjek
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
private
>Environment:
System: FreeBSD kryptos.mud.pl 4.8-STABLE FreeBSD 4.8-STABLE #1: Tue Jul 29 23:21:08 CEST 2003 toor at kryptos.mud.pl:/usr/src/sys/compile/POOH i386

>Description:
	/etc/periodic is directory with various scripts to rin
daily/weekly/monthly. /etc/periodic/daily/210.backup-aliases is a script for
monitoring changes in default /etc/mail/aliases

	Because I'm using postfix and want to have my own aliases file
located in /usr/local/etc/mail, so this script does not know about my
aliases. So I think it's good to add:

daily_backup_aliases_file=/etc/mail/aliases

to /etc/defaults/periodic.conf (patch also included in this PR)

>How-To-Repeat:
	Just run current /etc/periodic/daily/210.backup-aliases :-)))
>Fix:

Here it is a patch for script /etc/periodic/daily/210.backup-aliases

-------------------------- cut here ---------------------------------------
--- /etc/periodic/daily/210.backup-aliases	Thu Apr  3 10:55:40 2003
+++ 210.backup-aliases	Fri Oct  3 00:46:39 2003
@@ -13,31 +13,38 @@
 
 case "$daily_backup_aliases_enable" in
     [Yy][Ee][Ss])
-	if [ ! -f /etc/mail/aliases ]
+	if [ $daily_backup_aliases_file = "" ]
 	then
 	    echo '$daily_backup_aliases_enable is enabled but' \
-		"/etc/mail/aliases doesn't exist"
+		'$daily_backup_aliases_file is not defined'
 	    rc=2
 	else
-	    bak=/var/backups
-	    rc=0
+	    if [ ! -f $daily_backup_aliases_file ]
+	    then
+		echo '$daily_backup_aliases_enable is enabled but' \
+		"$daily_backup_aliases_file doesn't exist"
+		rc=2
+	    else
+		bak=/var/backups
+		rc=0
 
-	    echo ""
-	    echo "Backing up mail aliases:"
+		echo ""
+		echo "Backing up mail aliases:"
 
-	    if [ ! -f $bak/aliases.bak ]
-	    then
-		echo "no $bak/aliases.bak"
-		cp -p /etc/mail/aliases $bak/aliases.bak || rc=3
-	    fi
+		if [ ! -f $bak/aliases.bak ]
+		then
+		    echo "no $bak/aliases.bak"
+		    cp -p $daily_backup_aliases_file $bak/aliases.bak || rc=3
+		fi
 
-	    if ! cmp -s $bak/aliases.bak /etc/mail/aliases
-	    then
-		[ $rc -lt 1 ] && rc=1
-		echo "$host aliases diffs:"
-		diff -u $bak/aliases.bak /etc/mail/aliases
-		mv $bak/aliases.bak $bak/aliases.bak2
-		cp -p /etc/mail/aliases $bak/aliases.bak || rc=3
+		if ! cmp -s $bak/aliases.bak $daily_backup_aliases_file
+		then
+		    [ $rc -lt 1 ] && rc=1
+		    echo "$host aliases diffs:"
+		    diff -u $bak/aliases.bak $daily_backup_aliases_file
+		    mv $bak/aliases.bak $bak/aliases.bak2
+		    cp -p $daily_backup_aliases_file $bak/aliases.bak || rc=3
+		fi
 	    fi
 	fi;;
-------------------------- cut here ---------------------------------------

and here it is a patch for /etc/defaults/periodic.conf
-------------------------- cut here ---------------------------------------
--- /etc/defaults/periodic.conf	Tue Jul  8 18:56:26 2003
+++ periodic.conf	Fri Oct  3 00:57:30 2003
@@ -68,6 +68,7 @@
 
 # 210.backup-aliases
 daily_backup_aliases_enable="YES"			# Backup mail aliases
+daily_backup_aliases_file="/etc/mail/aliases"		# default aliases file
 
 # 220.backup-distfile
 daily_backup_distfile_enable="YES"			# Backup /etc/Distfile
-------------------------- cut here ---------------------------------------
>Release-Note:
>Audit-Trail:
>Unformatted: