diff options
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/crontab | 5 | ||||
| -rw-r--r-- | etc/monthly | 11 | ||||
| -rw-r--r-- | etc/mtree/special | 4 | ||||
| -rw-r--r-- | share/man/man8/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man8/afterboot.8 | 15 | ||||
| -rw-r--r-- | share/man/man8/daily.8 | 35 |
7 files changed, 55 insertions, 23 deletions
diff --git a/etc/Makefile b/etc/Makefile index ef4e7088289..a36d1082a7c 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.275 2009/05/09 14:21:24 schwarze Exp $ +# $OpenBSD: Makefile,v 1.276 2009/05/09 16:29:54 schwarze Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -14,7 +14,7 @@ BINOWN= root BINGRP= wheel BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \ exports ftpusers ftpchroot gettytab group hosts hosts.lpd inetd.conf \ - ksh.kshrc locate.rc man.conf motd mrouted.conf myname \ + ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \ netstart networks newsyslog.conf phones printcap protocols \ rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \ remote rpc security services shells syslog.conf weekly \ diff --git a/etc/crontab b/etc/crontab index 3b2c424491e..a2b9f802b13 100644 --- a/etc/crontab +++ b/etc/crontab @@ -1,4 +1,4 @@ -# $OpenBSD: crontab,v 1.16 2009/05/09 14:21:24 schwarze Exp $ +# $OpenBSD: crontab,v 1.17 2009/05/09 16:29:54 schwarze Exp $ # # /var/cron/tabs/root - root's crontab # @@ -16,7 +16,8 @@ HOME=/var/log # send log file notifications, if necessary #1-59 * * * * /usr/bin/newsyslog -m # -# do daily and weekly maintenance +# do daily/weekly/monthly maintenance 30 1 * * * umask 077; /bin/sh /etc/daily 2>&1 | tee /var/log/daily.out | mail -s "`/bin/hostname` daily output" root 30 3 * * 6 umask 077; /bin/sh /etc/weekly 2>&1 | tee /var/log/weekly.out | mail -s "`/bin/hostname` weekly output" root +30 5 1 * * umask 077; /bin/sh /etc/monthly 2>&1 | tee /var/log/monthly.out | mail -s "`/bin/hostname` monthly output" root #0 * * * * /usr/libexec/spamd-setup diff --git a/etc/monthly b/etc/monthly new file mode 100644 index 00000000000..1a0be6c5c35 --- /dev/null +++ b/etc/monthly @@ -0,0 +1,11 @@ +#!/bin/sh - +# $OpenBSD: monthly,v 1.9 2009/05/09 16:29:54 schwarze Exp $ +umask 022 + +if [ -f /etc/monthly.local ];then + echo "" + echo "Running monthly.local:" + . /etc/monthly.local +else + echo "Nothing to do!" +fi diff --git a/etc/mtree/special b/etc/mtree/special index d09856a240b..8fe78123c3c 100644 --- a/etc/mtree/special +++ b/etc/mtree/special @@ -1,4 +1,4 @@ -# $OpenBSD: special,v 1.83 2009/05/09 14:21:24 schwarze Exp $ +# $OpenBSD: special,v 1.84 2009/05/09 16:29:54 schwarze Exp $ # $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # @@ -47,6 +47,8 @@ login.conf type=file mode=0644 uname=root gname=wheel mail.rc type=file mode=0644 uname=root gname=wheel mailer.conf type=file mode=0644 uname=root gname=wheel master.passwd type=file mode=0600 uname=root gname=wheel +monthly type=file mode=0644 uname=root gname=wheel +monthly.local type=file mode=0644 uname=root gname=wheel optional mail type=dir mode=0755 uname=root gname=wheel aliases type=file mode=0644 uname=root gname=wheel optional aliases.db type=file mode=0644 uname=root gname=wheel optional diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 6b01cfa91ea..1ea53e0c62e 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.64 2009/05/09 14:21:24 schwarze Exp $ +# $OpenBSD: Makefile,v 1.65 2009/05/09 16:29:54 schwarze Exp $ # $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 @@ -11,7 +11,7 @@ MAN= afterboot.8 boot_config.8 compat_aout.8 compat_bsdos.8 \ starttls.8 sticky.8 update.8 yp.8 MLINKS+=boot_config.8 UKC.8 -MLINKS+=daily.8 weekly.8 +MLINKS+=daily.8 weekly.8 daily.8 monthly.8 MLINKS+=rc.8 rc.local.8 rc.8 rc.securelevel.8 MLINKS+=rc.conf.8 rc.conf.local.8 diff --git a/share/man/man8/afterboot.8 b/share/man/man8/afterboot.8 index 7894ed6b0ab..228c8af1107 100644 --- a/share/man/man8/afterboot.8 +++ b/share/man/man8/afterboot.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: afterboot.8,v 1.123 2009/05/09 14:21:24 schwarze Exp $ +.\" $OpenBSD: afterboot.8,v 1.124 2009/05/09 16:29:55 schwarze Exp $ .\" .\" Copyright (c) 1997 Marshall M. Midden .\" All rights reserved. @@ -483,16 +483,16 @@ option in your sendmail .mc file. See .Pa /usr/share/sendmail/README for more information. -.Ss Daily and weekly scripts -Look at the -.Pa /etc/daily +.Ss Daily, weekly, monthly scripts +Look at and possibly edit the +.Pa /etc/daily , /etc/weekly , and -.Pa /etc/weekly +.Pa /etc/monthly scripts. Your site specific things should go into -.Pa /etc/daily.local +.Pa /etc/daily.local , /etc/weekly.local , and -.Pa /etc/weekly.local . +.Pa /etc/monthly.local . .Pp These scripts have been limited so as to keep the system running without filling up disk space from normal running processes and database updates. @@ -540,6 +540,7 @@ and change some of the lines to read: .Bd -literal -offset indent 30 1 * * * /bin/sh /etc/daily 2>&1 > /var/log/daily.out 30 3 * * 6 /bin/sh /etc/weekly 2>&1 > /var/log/weekly.out +30 5 1 * * /bin/sh /etc/monthly 2>&1 > /var/log/monthly.out .Ed .Pp See diff --git a/share/man/man8/daily.8 b/share/man/man8/daily.8 index dbef12e704a..b63e696bfdf 100644 --- a/share/man/man8/daily.8 +++ b/share/man/man8/daily.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: daily.8,v 1.11 2009/05/09 14:21:24 schwarze Exp $ +.\" $OpenBSD: daily.8,v 1.12 2009/05/09 16:29:55 schwarze Exp $ .\" .\" Copyright (c) 2003 Jason McIntyre <jmc@openbsd.org> .\" @@ -18,16 +18,18 @@ .Dt DAILY 8 .Os .Sh NAME -.Nm daily , weekly +.Nm daily , weekly , monthly .Nd periodic system maintenance .Sh SYNOPSIS .Nm /etc/daily .Nm /etc/weekly +.Nm /etc/monthly .Sh DESCRIPTION -The files -.Pa /etc/daily +The three files +.Pa /etc/daily , +.Pa /etc/weekly , and -.Pa /etc/weekly +.Pa /etc/monthly are shell scripts run on a periodic basis by the clock daemon, .Xr cron 8 . They take care of some basic administrative tasks. @@ -47,13 +49,15 @@ for further details. .Pp These scripts should not be altered. Local additions should be made to the files -.Pa /etc/daily.local -and +.Pa /etc/daily.local , .Pa /etc/weekly.local , -which will be executed by -.Pa /etc/daily and +.Pa /etc/monthly.local , +which will be executed by +.Pa /etc/daily , .Pa /etc/weekly , +and +.Pa /etc/monthly , respectively. The .Pa *.local @@ -192,6 +196,15 @@ file exists, show individual users' login via the .Xr ac 8 utility. .El +.Ss /etc/monthly +This script is run monthly. +It currently does the following: +.Bl -dash +.It +Runs the script +.Pa /etc/monthly.local , +if it exists. +.El .Sh ENVIRONMENT The following variables can be set in .Pa /etc/daily.local : @@ -227,6 +240,10 @@ Site specific daily maintenance script. Weekly maintenance script. .It Pa /etc/weekly.local Site specific weekly maintenance script. +.It Pa /etc/monthly +Monthly maintenance script. +.It Pa /etc/monthly.local +Site specific monthly maintenance script. .It Pa /var/cron/tabs/root Root .Xr crontab 5 . |