Browse Source

hook up slowcgi to the tree, including /etc glue and a sample configuration

snippet; ok florian@
OPENBSD_5_4
naddy 11 years ago
parent
commit
6ee85026c2
4 changed files with 20 additions and 8 deletions
  1. +5
    -5
      src/etc/Makefile
  2. +2
    -2
      src/etc/rc
  3. +2
    -1
      src/etc/rc.conf
  4. +11
    -0
      src/etc/rc.d/slowcgi

+ 5
- 5
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.331 2013/03/31 21:46:53 espie Exp $
# $OpenBSD: Makefile,v 1.332 2013/06/01 14:06:20 naddy Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -53,10 +53,10 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \ inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \ relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \
sensorsd smtpd snmpd spamd sshd syslogd watchdogd wsmoused \
xdm ypbind ypldap yppasswdd ypserv kdc kadmind kpasswdd nfsd \
mountd lockd statd spamlogd sndiod popa3d tftpd tftpproxy \
ldomd
sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \
kpasswdd nfsd mountd lockd statd spamlogd sndiod popa3d \
tftpd tftpproxy ldomd
MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ MISETS= base${OSrev}.tgz comp${OSrev}.tgz \
man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz


+ 2
- 2
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.405 2012/11/18 18:29:10 ajacoutot Exp $
# $OpenBSD: rc,v 1.406 2013/06/01 14:06:20 naddy 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.
@ -493,7 +493,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
fi fi
fi fi
start_daemon hostapd rwhod lpd sendmail smtpd httpd nginx ftpd ftpproxy
start_daemon hostapd rwhod lpd sendmail smtpd httpd slowcgi nginx ftpd ftpproxy
start_daemon tftpd tftpproxy identd inetd rarpd bootparamd rbootd mopd start_daemon tftpd tftpproxy identd inetd rarpd bootparamd rbootd mopd
start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd sndiod start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd sndiod
echo '.' echo '.'


+ 2
- 1
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh - #!/bin/sh -
# #
# $OpenBSD: rc.conf,v 1.178 2013/04/29 14:11:32 ajacoutot Exp $
# $OpenBSD: rc.conf,v 1.179 2013/06/01 14:06:20 naddy Exp $
# DO NOT EDIT THIS FILE!! # DO NOT EDIT THIS FILE!!
# #
@ -75,6 +75,7 @@ httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8))
# use -u to disable chroot, see nginx(8) # use -u to disable chroot, see nginx(8)
nginx_flags=NO # for normal use: "" nginx_flags=NO # for normal use: ""
slowcgi_flags=NO # for normal use: ""
# For normal use: "-L sm-mta -bd -q30m", and note there is a cron job # 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" sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"


+ 11
- 0
src/etc/rc.d/slowcgi View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $OpenBSD: slowcgi,v 1.1 2013/06/01 14:06:20 naddy Exp $
daemon="/usr/sbin/slowcgi"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1

Loading…
Cancel
Save