diff options
| author |   schwarze <schwarze@openbsd.org> | 2009-05-09 14:21:24 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2009-05-09 14:21:24 +0000 |
| commit | c4dc3e320648e55a1ed2bd5fc7b87d81cdb0063b (patch) | |
| tree | ce0ddbe7da834fcac78489634fef45321aa6301b /etc | |
| parent | - mention that configuring new GPIO pins is locked out with securelevel>0, (diff) | |
| download | wireguard-openbsd-c4dc3e320648e55a1ed2bd5fc7b87d81cdb0063b.tar.xz wireguard-openbsd-c4dc3e320648e55a1ed2bd5fc7b87d81cdb0063b.zip | |
remove the empty script /etc/monthly
in preparation for improvements in /etc/daily and /etc/weekly
using feedback and suggestions from jmc@ and sthen@
ok jmc@, and sthen@ agreed with the general direction
Diffstat (limited to 'etc')
| -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 |
4 files changed, 5 insertions, 19 deletions
diff --git a/etc/Makefile b/etc/Makefile index 6915b750ed5..ef4e7088289 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.274 2009/04/25 17:36:46 deraadt Exp $ +# $OpenBSD: Makefile,v 1.275 2009/05/09 14:21:24 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 monthly motd mrouted.conf myname \ + ksh.kshrc locate.rc man.conf 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 6e8c8e8b38d..3b2c424491e 100644 --- a/etc/crontab +++ b/etc/crontab @@ -1,4 +1,4 @@ -# $OpenBSD: crontab,v 1.15 2007/02/27 16:04:16 beck Exp $ +# $OpenBSD: crontab,v 1.16 2009/05/09 14:21:24 schwarze Exp $ # # /var/cron/tabs/root - root's crontab # @@ -16,8 +16,7 @@ HOME=/var/log # send log file notifications, if necessary #1-59 * * * * /usr/bin/newsyslog -m # -# do daily/weekly/monthly maintenance +# do daily and weekly 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 deleted file mode 100644 index 8b82ef0cb9b..00000000000 --- a/etc/monthly +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# $OpenBSD: monthly,v 1.7 2006/10/26 12:20:55 ajacoutot 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 50c7d17145f..d09856a240b 100644 --- a/etc/mtree/special +++ b/etc/mtree/special @@ -1,4 +1,4 @@ -# $OpenBSD: special,v 1.82 2009/03/16 22:16:12 jacekm Exp $ +# $OpenBSD: special,v 1.83 2009/05/09 14:21:24 schwarze Exp $ # $NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # @@ -47,8 +47,6 @@ 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 |