jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

periodic: Make daily diff(1) output as small is possible

Browse Source 
Make, by default, daily diff(1) ignore whitespace changes and the unified output
a context of zero (0) lines. This reduces output of unrelated lines in e-mails
delivered to root.

PR:		270266
Approved by:	jrm (mentor), karels
MFC after:	1 month
Relnotes:	yes
Differential Revision:	https://reviews.freebsd.org/D42762
This commit is contained in:
Michael Osipov 2023-11-24 10:26:41 +01:00
parent 15e35d058c
commit e2f6bafc38
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
share/man/man5/periodic.conf.5
View File

@ -644,6 +644,9 @@ All scripts must be absolute path names.
Set to the arguments to pass to the
.Xr diff 1
utility when generating differences.
The default is
.Fl b
.Fl U Cm 0 .
.El
.Pp
The following variables are used by the standard scripts that reside in

4
usr.sbin/periodic/etc/daily/200.backup-passwd
View File

@ -40,7 +40,7 @@ case "$daily_backup_passwd_enable" in
then
[ $rc -lt 1 ] && rc=1
echo "$host passwd diffs:"
diff ${daily_diff_flags:--u} -I '^#' $bak/master.passwd.bak /etc/master.passwd |\
diff ${daily_diff_flags} -I '^#' $bak/master.passwd.bak /etc/master.passwd |\
sed 's/^\([-+ ][^:]*\):[^:]*:/\1:(password):/'
mv $bak/master.passwd.bak $bak/master.passwd.bak2
cp -p /etc/master.passwd $bak/master.passwd.bak || rc=3
@ -57,7 +57,7 @@ case "$daily_backup_passwd_enable" in
then
[ $rc -lt 1 ] && rc=1
echo "$host group diffs:"
diff ${daily_diff_flags:--u} $bak/group.bak /etc/group
diff ${daily_diff_flags} $bak/group.bak /etc/group
mv $bak/group.bak $bak/group.bak2
cp -p /etc/group $bak/group.bak || rc=3
fi

2
usr.sbin/periodic/etc/daily/210.backup-aliases
View File

@ -34,7 +34,7 @@ case "$daily_backup_aliases_enable" in
then
[ $rc -lt 1 ] && rc=1
echo "$host aliases diffs:"
diff ${daily_diff_flags:--u} $bak/aliases.bak /etc/mail/aliases
diff ${daily_diff_flags} $bak/aliases.bak /etc/mail/aliases
mv $bak/aliases.bak $bak/aliases.bak2
cp -p /etc/mail/aliases $bak/aliases.bak || rc=3
fi

2
usr.sbin/periodic/periodic.conf
View File

@ -31,7 +31,7 @@ anticongestion_sleeptime=3600
# that output. $daily_output might be set to /var/log/daily.log if you
# wish to log the daily output and have the files rotated by newsyslog(8)
#
daily_diff_flags="" # flags for diff output
daily_diff_flags="-b -U 0" # flags for diff output
daily_output="root" # user or /file
daily_show_success="YES" # scripts returning 0
daily_show_info="YES" # scripts returning 1