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

snippet; ok florian@

6 files changed, 33 insertions, 12 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 9b2ae3c0c8e..c897575bcfa 100644
--- a/etc/Makefile
+++ b/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/etc/rc b/etc/rc
index 82965bce0c9..6aa15d8822e 100644
--- a/etc/rc
+++ b/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/etc/rc.conf b/etc/rc.conf
index 881ff9e6fd2..43ac916abe0 100644
--- a/etc/rc.conf
+++ b/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/etc/rc.d/slowcgi b/etc/rc.d/slowcgi
new file mode 100644
index 00000000000..9c1ba4b13ae
--- /dev/null
+++ b/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
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index cc2841ccd30..dbc604b5e04 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.167 2013/05/30 19:18:24 bmercer Exp $
+#	$OpenBSD: Makefile,v 1.168 2013/06/01 14:06:20 naddy Exp $
 
 .include <bsd.own.mk>
 
@@ -14,8 +14,8 @@ SUBDIR=	ac accton acpidump adduser amd apm apmd arp \
 	pcidump pkg_add popa3d portmap ppp pppd pppoe procmap pstat pwd_mkdb \
 	quot quotaon rarpd rbootd rdate relayctl relayd repquota rip6query \
 	ripctl ripd rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd \
-	rtsold rwhod sa sasyncd sensorsd sliplogin slstats smtpd snmpctl \
-	snmpd spamdb spray syslogc syslogd sysmerge tcpdrop tcpdump \
+	rtsold rwhod sa sasyncd sensorsd sliplogin slowcgi slstats smtpd \
+	snmpctl snmpd spamdb spray syslogc syslogd sysmerge tcpdrop tcpdump \
 	tftp-proxy tftpd tokenadm tokeninit traceroute traceroute6 trpt \
 	usbdevs user vipw watchdogd wsconscfg wsfontload wsmoused zdump zic \
 	ztsscale
diff --git a/usr.sbin/nginx/conf/nginx.conf b/usr.sbin/nginx/conf/nginx.conf
index f92da74fe66..ddfb5a8ac67 100644
--- a/usr.sbin/nginx/conf/nginx.conf
+++ b/usr.sbin/nginx/conf/nginx.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: nginx.conf,v 1.12 2013/05/31 19:40:28 naddy Exp $
+# $OpenBSD: nginx.conf,v 1.13 2013/06/01 14:06:20 naddy Exp $
 
 #user  www;
 worker_processes  1;
@@ -56,6 +56,15 @@ http {
             root  /var/www/htdocs;
         }
 
+        # FastCGI to CGI wrapper server
+        #
+        #location /cgi-bin/ {
+        #    fastcgi_pass   unix:logs/slowcgi.sock;
+        #    fastcgi_split_path_info ^(/cgi-bin/[^/]+)(.*);
+        #    fastcgi_param  PATH_INFO $fastcgi_path_info;
+        #    include        fastcgi_params;
+        #}
+
         # proxy the PHP scripts to Apache listening on 127.0.0.1:80
         #
         #location ~ \.php$ {