From fcf01602a43f37f9b8a4f05f9f63eedb4e35a72e Mon Sep 17 00:00:00 2001
From: robert <>
Date: Sun, 19 Feb 2012 11:34:36 +0000
Subject: [PATCH] enable nginx

---
 src/etc/Makefile          |  7 ++++---
 src/etc/mtree/4.4BSD.dist |  7 ++++++-
 src/etc/rc.d/nginx        | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 src/etc/rc.d/nginx

diff --git a/src/etc/Makefile b/src/etc/Makefile
index ee0b37c8..4272cefb 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.313 2012/02/09 04:39:32 david Exp $
+#	$OpenBSD: Makefile,v 1.314 2012/02/19 11:34:36 robert Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -50,8 +50,8 @@ BIN2=	motd
 # -r-xr-xr-x
 RCDAEMONS=	amd apmd 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 ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \
+		inetd isakmpd ldapd 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 \
@@ -270,6 +270,7 @@ distribution-etc-root-var: distrib-dirs
 	cd ../usr.bin/bgplg && exec ${MAKE} distribution
 	cd ../usr.bin/mail && exec ${MAKE} distribution
 	cd ../usr.sbin/ldapd && exec ${MAKE} distribution
+	cd ../usr.sbin/nginx && exec ${MAKE} -f Makefile.bsd-wrapper distribution
 	cd mail && exec ${MAKE} distribution
 	${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
 	    ${DESTDIR}/var/mail/root
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index cf96f043..2c1c1315 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.220 2012/01/26 18:45:41 dhill Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.221 2012/02/19 11:34:36 robert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -188,6 +188,11 @@ mtree
 # ./etc/mtree
 ..
 
+# ./etc/nginx
+nginx
+# ./etc/nginx
+..
+
 # ./etc/ppp
 ppp
 # ./etc/ppp
diff --git a/src/etc/rc.d/nginx b/src/etc/rc.d/nginx
new file mode 100644
index 00000000..bfb775e3
--- /dev/null
+++ b/src/etc/rc.d/nginx
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# $OpenBSD: nginx,v 1.1 2012/02/19 11:34:36 robert Exp $
+
+daemon="/usr/sbin/nginx"
+
+. /etc/rc.d/rc.subr
+
+pexp="nginx:.*master.*process"
+
+rc_reload() {
+	${daemon} -s reload
+}
+
+rc_stop() {
+	${daemon} -s stop || pkill -f "^${pexp}"
+}
+
+rc_cmd $1