Browse Source

enable nginx

OPENBSD_5_2
robert 12 years ago
parent
commit
fcf01602a4
3 changed files with 29 additions and 4 deletions
  1. +4
    -3
      src/etc/Makefile
  2. +6
    -1
      src/etc/mtree/4.4BSD.dist
  3. +19
    -0
      src/etc/rc.d/nginx

+ 4
- 3
src/etc/Makefile View File

@ -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 TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -50,8 +50,8 @@ BIN2= motd
# -r-xr-xr-x # -r-xr-xr-x
RCDAEMONS= amd apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \ RCDAEMONS= amd apmd bgpd bootparamd btd cron dhcpd dhcrelay dvmrpd \
ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ 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 \ route6d rtadvd rtsold rwhod sasyncd sendmail sensorsd smtpd \
snmpd spamd sshd syslogd watchdogd wsmoused xdm ypbind ypldap \ snmpd spamd sshd syslogd watchdogd wsmoused xdm ypbind ypldap \
yppasswdd ypserv kdc kadmind kpasswdd nfsd mountd lockd statd \ 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/bgplg && exec ${MAKE} distribution
cd ../usr.bin/mail && exec ${MAKE} distribution cd ../usr.bin/mail && exec ${MAKE} distribution
cd ../usr.sbin/ldapd && 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 cd mail && exec ${MAKE} distribution
${INSTALL} -c -o root -g wheel -m 600 root/root.mail \ ${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
${DESTDIR}/var/mail/root ${DESTDIR}/var/mail/root


+ 6
- 1
src/etc/mtree/4.4BSD.dist View File

@ -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 /set type=dir uname=root gname=wheel mode=0755
# . # .
@ -188,6 +188,11 @@ mtree
# ./etc/mtree # ./etc/mtree
.. ..
# ./etc/nginx
nginx
# ./etc/nginx
..
# ./etc/ppp # ./etc/ppp
ppp ppp
# ./etc/ppp # ./etc/ppp


+ 19
- 0
src/etc/rc.d/nginx View File

@ -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

Loading…
Cancel
Save