From 6ee85026c2d6cb99da35ae2e5c40265f41243878 Mon Sep 17 00:00:00 2001 From: naddy <> Date: Sat, 1 Jun 2013 14:06:20 +0000 Subject: [PATCH] hook up slowcgi to the tree, including /etc glue and a sample configuration snippet; ok florian@ --- src/etc/Makefile | 10 +++++----- src/etc/rc | 4 ++-- src/etc/rc.conf | 3 ++- src/etc/rc.d/slowcgi | 11 +++++++++++ 4 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 src/etc/rc.d/slowcgi diff --git a/src/etc/Makefile b/src/etc/Makefile index 9b2ae3c0..c897575b 100644 --- a/src/etc/Makefile +++ b/src/etc/Makefile @@ -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 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 \ named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ 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 \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz diff --git a/src/etc/rc b/src/etc/rc index 82965bce..6aa15d88 100644 --- a/src/etc/rc +++ b/src/etc/rc @@ -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 # or after single-user. @@ -493,7 +493,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then 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 popa3d spamd spamlogd kdc kadmind kpasswdd sndiod echo '.' diff --git a/src/etc/rc.conf b/src/etc/rc.conf index 881ff9e6..43ac916a 100644 --- a/src/etc/rc.conf +++ b/src/etc/rc.conf @@ -1,6 +1,6 @@ #!/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!! # @@ -75,6 +75,7 @@ httpd_flags=NO # for normal use: "" (or "-DSSL" after reading ssl(8)) # use -u to disable chroot, see nginx(8) 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 sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m" diff --git a/src/etc/rc.d/slowcgi b/src/etc/rc.d/slowcgi new file mode 100644 index 00000000..9c1ba4b1 --- /dev/null +++ b/src/etc/rc.d/slowcgi @@ -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