enable nginx

4 files changed, 33 insertions, 8 deletions

diff --git a/etc/Makefile b/etc/Makefile
index ee0b37c8825..4272cefb0d9 100644
--- a/etc/Makefile
+++ b/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/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist
index cf96f0434f2..2c1c1315465 100644
--- a/etc/mtree/4.4BSD.dist
+++ b/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/etc/rc.d/nginx b/etc/rc.d/nginx
new file mode 100755
index 00000000000..bfb775e3cdc
--- /dev/null
+++ b/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
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 42d374f8801..55cbece7387 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.159 2011/07/09 01:16:57 halex Exp $
+#	$OpenBSD: Makefile,v 1.160 2012/02/19 11:34:36 robert Exp $
 
 .include <bsd.own.mk>
 
@@ -9,9 +9,9 @@ SUBDIR=	ac accton acpidump adduser amd apm apmd arp \
 	inetd iostat iscsictl iscsid \
 	kgmon kvm_mkdb ldapd ldapctl ldpd ldpctl lpr mailwrapper map-mbone \
 	memconfig mksuncd mopd mrinfo mrouted mtrace mtree ndp netgroup_mkdb \
-	nsd ntpd openssl ospfctl ospfd ospf6d ospf6ctl pcidump pkg_add popa3d \
-	portmap ppp pppd pppoe procmap pstat pwd_mkdb quot quotaon rarpd \
-	rbootd rdate relayctl relayd repquota rip6query ripctl ripd \
+	nginx nsd ntpd openssl ospfctl ospfd ospf6d ospf6ctl 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 tokenadm \