From owner-freebsd-bugs@FreeBSD.ORG Thu Oct 2 16:10:15 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 911C716A4B3 for ; Thu, 2 Oct 2003 16:10:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93C9543FFD for ; Thu, 2 Oct 2003 16:10:13 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h92NADFY067671 for ; Thu, 2 Oct 2003 16:10:13 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h92NADNv067670; Thu, 2 Oct 2003 16:10:13 -0700 (PDT) (envelope-from gnats) Resent-Date: Thu, 2 Oct 2003 16:10:13 -0700 (PDT) Resent-Message-Id: <200310022310.h92NADNv067670@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Krzysztof Stryjek Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 26A5716A4B3 for ; Thu, 2 Oct 2003 16:01:40 -0700 (PDT) Received: from kryptos.mud.pl (201-moc-7.acn.waw.pl [212.76.58.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C3A043FD7 for ; Thu, 2 Oct 2003 16:01:38 -0700 (PDT) (envelope-from wtp@mud.pl) Received: from localhost (unknown [127.0.0.1]) by kryptos.mud.pl (Postfix) with ESMTP id AED422638E for ; Thu, 2 Oct 2003 23:01:35 +0000 (GMT) Received: from kryptos.mud.pl ([127.0.0.1]) by localhost (kryptos.mud.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 92836-04 for ; Fri, 3 Oct 2003 01:01:33 +0200 (CEST) Received: by kryptos.mud.pl (Postfix, from userid 1000) id E35EE26391; Fri, 3 Oct 2003 01:01:33 +0200 (CEST) Message-Id: <20031002230133.E35EE26391@kryptos.mud.pl> Date: Fri, 3 Oct 2003 01:01:33 +0200 (CEST) From: Krzysztof Stryjek To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: conf/57517: add parameter for /etc/periodic/daily/210.backup-aliases in /etc/defaults/periodic.conf X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Krzysztof Stryjek List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2003 23:10:15 -0000 >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@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: