Browse Source

add scripts for aucat and spamd and switch rc to use them

OPENBSD_5_0
robert 13 years ago
parent
commit
0aee152d4c
4 changed files with 45 additions and 20 deletions
  1. +4
    -4
      src/etc/Makefile
  2. +10
    -16
      src/etc/rc
  3. +15
    -0
      src/etc/rc.d/aucat
  4. +16
    -0
      src/etc/rc.d/spamd

+ 4
- 4
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.302 2011/07/07 22:30:37 robert Exp $
# $OpenBSD: Makefile,v 1.303 2011/07/07 23:29:45 robert Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -31,11 +31,11 @@ BIN1+= wsconsctl.conf
BIN2= motd BIN2= motd
# -r-xr-xr-x # -r-xr-xr-x
RCDAEMONS= apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
hostapd hotplugd httpd identd ifstated iked inetd isakmpd \
RCDAEMONS= apmd aucat bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd ftpd \
ftpproxy hostapd hotplugd httpd identd ifstated iked inetd isakmpd \
ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \ ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \
rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \ rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \
sendmail sensorsd smtpd snmpd sshd syslogd watchdogd wsmoused \
sendmail sensorsd smtpd snmpd spamd sshd syslogd watchdogd wsmoused \
xdm ypbind ypldap yppasswdd ypserv xdm ypbind ypldap yppasswdd ypserv
MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ MISETS= base${OSrev}.tgz comp${OSrev}.tgz \


+ 10
- 16
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.364 2011/07/07 23:09:46 guenther Exp $
# $OpenBSD: rc,v 1.365 2011/07/07 23:29:45 robert Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -571,16 +571,14 @@ start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd \
[ X"${bt}" != X"NO" -a -f ${bt_rules} ] && \ [ X"${bt}" != X"NO" -a -f ${bt_rules} ] && \
btctl -f ${bt_rules} btctl -f ${bt_rules}
if [ X"${spamd_flags}" != X"NO" ]; then
if [ X"${spamd_black}" != X"NO" ]; then
spamd_flags="${spamd_flags} -b"
fi
echo -n ' spamd'; eval /usr/libexec/spamd ${spamd_flags}
start_daemon spamd
[ X"${spamd_flags}" != X"NO" ] && \
/usr/libexec/spamd-setup -D /usr/libexec/spamd-setup -D
if [ X"${spamd_black}" = X"NO" ]; then
echo -n ' spamlogd'
/usr/libexec/spamlogd ${spamlogd_flags}
fi
if [ X"${spamd_black}" = X"NO" ]; then
echo -n ' spamlogd'
/usr/libexec/spamlogd ${spamlogd_flags}
fi fi
echo '.' echo '.'
@ -621,13 +619,9 @@ echo '.'
date date
mixerctl_conf mixerctl_conf
echo -n 'starting console services:'
if [ X"${aucat_flags}" != X"NO" ]; then
echo -n ' aucat'; aucat -l ${aucat_flags}
fi
start_daemon wsmoused xdm
echo -n 'starting console services:'
start_daemon aucat wsmoused xdm
echo '.' echo '.'
exit 0 exit 0

+ 15
- 0
src/etc/rc.d/aucat View File

@ -0,0 +1,15 @@
#!/bin/sh
#
# $OpenBSD: aucat,v 1.1 2011/07/07 23:29:45 robert Exp $
daemon="/usr/bin/aucat"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_pre() {
daemon_flags="-l ${daemon_flags}"
}
rc_cmd $1

+ 16
- 0
src/etc/rc.d/spamd View File

@ -0,0 +1,16 @@
#!/bin/sh
#
# $OpenBSD: spamd,v 1.1 2011/07/07 23:29:45 robert Exp $
daemon="/usr/libexec/spamd"
. /etc/rc.d/rc.subr
pexp="spamd: \[priv\]"
rc_pre() {
[ X"${spamd_black}" != X"NO" ] && \
daemon_flags="-b ${daemon_flags}"
}
rc_cmd $1

Loading…
Cancel
Save