diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-12-27 01:30:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-12-27 01:30:20 +0000 |
| commit | 8b43b7e3f6383aaa257062862a2b7cf2fb90366c (patch) | |
| tree | f24734f2c5de0522ec4a7ab5dd534fd6ed38fa97 /etc | |
| parent | 5ffd26186ae83b45bdc1c3f76ec39a38711cecca (diff) | |
spamd startup stuff
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/crontab | 3 | ||||
| -rw-r--r-- | etc/rc | 7 | ||||
| -rw-r--r-- | etc/rc.conf | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/etc/crontab b/etc/crontab index eba918ef1f2..9a4c7ba8a40 100644 --- a/etc/crontab +++ b/etc/crontab @@ -1,4 +1,4 @@ -# $OpenBSD: crontab,v 1.10 2002/07/15 19:13:28 millert Exp $ +# $OpenBSD: crontab,v 1.11 2002/12/27 01:30:19 deraadt Exp $ # # /var/cron/tabs/root - root's crontab # @@ -20,3 +20,4 @@ HOME=/var/log 30 1 * * * /bin/sh /etc/daily 2>&1 | tee /var/log/daily.out | mail -s "`/bin/hostname` daily output" root 30 3 * * 6 /bin/sh /etc/weekly 2>&1 | tee /var/log/weekly.out | mail -s "`/bin/hostname` weekly output" root 30 5 1 * * /bin/sh /etc/monthly 2>&1 | tee /var/log/monthly.out | mail -s "`/bin/hostname` monthly output" root +#*/4 * * * * /usr/libexec/spamd-setup -s @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.211 2002/12/24 15:53:17 mcbride Exp $ +# $OpenBSD: rc,v 1.212 2002/12/27 01:30:19 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -487,6 +487,11 @@ if [ "X${sendmail_flags}" != X"NO" -a -s /etc/mailer.conf ]; then echo -n ' sendmail'; ( /usr/sbin/sendmail ${sendmail_flags} >/dev/null 2>&1 & ) fi +if [ "X${spamd_flags}" != X"NO" ]; then + echo -n ' spamd'; /usr/libexec/spamd ${spamd_flags} + /usr/libexec/spamd-setup ${spamd_setup} +fi + if [ "X${httpd_flags}" != X"NO" ]; then # Clean up left-over httpd locks rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.* diff --git a/etc/rc.conf b/etc/rc.conf index 4900f8d837f..e643a383f70 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.82 2002/12/03 19:15:06 miod Exp $ +# $OpenBSD: rc.conf,v 1.83 2002/12/27 01:30:19 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -32,6 +32,8 @@ httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8)) # For normal use: "-L sm-mta -bd -q30m", and note there is a cron job sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m" +spamd_flags=NO # for normal use: "" and see spewd-setup(8) +spamd_setup= # for normal use: -1 or other such options # Set to NO if ftpd is running out of inetd ftpd_flags=NO # for non-inetd use: "-D" |