diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-03-03 01:06:45 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-03-03 01:06:45 +0000 |
| commit | fe86680e742cb2f014578ec5802f190f842e2dc3 (patch) | |
| tree | 628da4ae43a88a09e9a9c83ab61f1521473d59d4 /etc/rc | |
| parent | f3b121190609f4f951ab26c14beea566284c6042 (diff) | |
move spamd to a better place; ok henning beck
Diffstat (limited to 'etc/rc')
| -rw-r--r-- | etc/rc | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.237 2004/03/02 16:11:10 deraadt Exp $ +# $OpenBSD: rc,v 1.238 2004/03/03 01:06:44 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. @@ -497,18 +497,6 @@ 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 - if [ "X${spamd_grey}" != X"NO" ]; then - spamd_flags="${spamd_flags} -g" - fi - echo -n ' spamd'; /usr/libexec/spamd ${spamd_flags} - /usr/libexec/spamd-setup - if [ "X${spamd_grey}" != X"NO" ]; then - echo -n ' spamlogd' - /usr/libexec/spamlogd - fi -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}.* @@ -531,6 +519,18 @@ if [ X"${sshd_flags}" != X"NO" ]; then echo -n ' sshd'; /usr/sbin/sshd ${sshd_flags}; fi +if [ "X${spamd_flags}" != X"NO" ]; then + if [ "X${spamd_grey}" != X"NO" ]; then + spamd_flags="${spamd_flags} -g" + fi + echo -n ' spamd'; /usr/libexec/spamd ${spamd_flags} + /usr/libexec/spamd-setup + if [ "X${spamd_grey}" != X"NO" ]; then + echo -n ' spamlogd' + /usr/libexec/spamlogd + fi +fi + # $rarpd_flags is imported from /etc/rc.conf; # If $rarpd_flags == NO or /etc/ethers doesn't exist, then # rarpd isn't run. |