diff options
| -rw-r--r-- | distrib/sets/lists/base/mi | 7 | ||||
| -rw-r--r-- | distrib/sets/lists/etc/mi | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/man/mi | 2 | ||||
| -rw-r--r-- | etc/Makefile | 5 | ||||
| -rw-r--r-- | etc/changelist | 4 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 4 | ||||
| -rw-r--r-- | etc/newsyslog.conf | 4 | ||||
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 4 | ||||
| -rw-r--r-- | etc/rc.d/nginx | 19 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 11 | ||||
| -rw-r--r-- | share/man/man8/intro.8 | 24 | ||||
| -rw-r--r-- | share/man/man8/ssl.8 | 16 |
13 files changed, 30 insertions, 78 deletions
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 497e4f6893d..d25d550ed1e 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -123,11 +123,6 @@ ./etc/mtree/special ./etc/netstart ./etc/networks -./etc/nginx -./etc/nginx/koi-utf -./etc/nginx/koi-win -./etc/nginx/mime.types -./etc/nginx/win-utf ./etc/npppd ./etc/pf.os ./etc/ppp @@ -165,7 +160,6 @@ ./etc/rc.d/mountd ./etc/rc.d/mrouted ./etc/rc.d/nfsd -./etc/rc.d/nginx ./etc/rc.d/npppd ./etc/rc.d/nsd ./etc/rc.d/ntpd @@ -2818,7 +2812,6 @@ ./usr/sbin/mtree ./usr/sbin/ndp ./usr/sbin/netgroup_mkdb -./usr/sbin/nginx ./usr/sbin/npppctl ./usr/sbin/npppd ./usr/sbin/nsd diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index e57244fa093..1c8db730da2 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -43,10 +43,6 @@ ./etc/motd ./etc/myname ./etc/newsyslog.conf -./etc/nginx/fastcgi_params -./etc/nginx/nginx.conf -./etc/nginx/scgi_params -./etc/nginx/uwsgi_params ./etc/npppd/npppd-users ./etc/npppd/npppd.conf ./etc/passwd diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 2572b65c10d..69d10c76a68 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -2243,7 +2243,6 @@ ./usr/share/man/man5/netid.5 ./usr/share/man/man5/networks.5 ./usr/share/man/man5/newsyslog.conf.5 -./usr/share/man/man5/nginx.conf.5 ./usr/share/man/man5/npppd-users.5 ./usr/share/man/man5/npppd.conf.5 ./usr/share/man/man5/nsd.conf.5 @@ -2571,7 +2570,6 @@ ./usr/share/man/man8/newfs_msdos.8 ./usr/share/man/man8/newsyslog.8 ./usr/share/man/man8/nfsd.8 -./usr/share/man/man8/nginx.8 ./usr/share/man/man8/nologin.8 ./usr/share/man/man8/npppctl.8 ./usr/share/man/man8/npppd.8 diff --git a/etc/Makefile b/etc/Makefile index bd606f722eb..c2fee1cad01 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.389 2014/08/22 19:19:25 deraadt Exp $ +# $OpenBSD: Makefile,v 1.390 2014/08/26 19:33:48 robert Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -54,7 +54,7 @@ EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \ - nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ + nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ relayd ripd route6d rtadvd rtsold sasyncd sendmail \ sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \ wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \ @@ -204,7 +204,6 @@ distribution-etc-root-var: distrib-dirs cd ../usr.bin/mail && exec ${MAKE} distribution cd ../usr.sbin/sliplogin && exec ${MAKE} distribution cd ../usr.sbin/ldapd && exec ${MAKE} distribution - cd ../usr.sbin/nginx && exec ${MAKE} -f Makefile.bsd-wrapper distribution cd ../usr.sbin/npppd && exec ${MAKE} distribution cd mail && exec ${MAKE} distribution ${INSTALL} -c -o root -g wheel -m 600 root/root.mail \ diff --git a/etc/changelist b/etc/changelist index 186f6780173..6516d074da2 100644 --- a/etc/changelist +++ b/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.99 2014/08/22 19:19:25 deraadt Exp $ +# $OpenBSD: changelist,v 1.100 2014/08/26 19:33:48 robert Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -89,8 +89,6 @@ /etc/netstart /etc/networks /etc/newsyslog.conf -/etc/nginx/mime.types -/etc/nginx/nginx.conf /etc/npppd/npppd.conf +/etc/npppd/npppd-users /etc/ntpd.conf diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index 1d8943ad0b3..d7cf5555340 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.262 2014/08/22 19:19:25 deraadt Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.263 2014/08/26 19:33:48 robert Exp $ /set type=dir uname=root gname=wheel mode=0755 @@ -84,8 +84,6 @@ etc .. mtree .. - nginx - .. npppd .. ppp diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf index 78d5633adc8..cfa6dad35bc 100644 --- a/etc/newsyslog.conf +++ b/etc/newsyslog.conf @@ -1,4 +1,4 @@ -# $OpenBSD: newsyslog.conf,v 1.31 2014/03/21 13:22:09 ajacoutot Exp $ +# $OpenBSD: newsyslog.conf,v 1.32 2014/08/26 19:33:48 robert Exp $ # # configuration file for newsyslog # @@ -14,5 +14,3 @@ /var/log/wtmp 644 7 * $W6D4 B /var/log/xferlog 640 7 250 * Z /var/log/pflog 600 3 250 * ZB "pkill -HUP -u root -U root -t - -x pflogd" -/var/www/logs/access.log 644 4 * $W0 Z /var/run/nginx.pid SIGUSR1 -/var/www/logs/error.log 644 7 250 * Z /var/run/nginx.pid SIGUSR1 @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.440 2014/08/22 19:19:25 deraadt Exp $ +# $OpenBSD: rc,v 1.441 2014/08/26 19:33:48 robert Exp $ # System startup script run by init on autoboot # or after single-user. @@ -498,7 +498,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then fi fi -start_daemon hostapd lpd sendmail smtpd slowcgi nginx httpd ftpd +start_daemon hostapd lpd sendmail smtpd slowcgi httpd ftpd start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd start_daemon rbootd mopd spamd spamlogd sndiod echo '.' diff --git a/etc/rc.conf b/etc/rc.conf index 294196decff..8a3806da333 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,4 +1,4 @@ -# $OpenBSD: rc.conf,v 1.196 2014/08/22 19:19:25 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.197 2014/08/26 19:33:48 robert Exp $ # DO NOT EDIT THIS FILE!! # @@ -66,8 +66,6 @@ identd_flags=NO # for normal use: "-e" cron_flags= # for normal use: "" iscsid_flags=NO # for normal use: "" -# 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 diff --git a/etc/rc.d/nginx b/etc/rc.d/nginx deleted file mode 100644 index bfb775e3cdc..00000000000 --- a/etc/rc.d/nginx +++ /dev/null @@ -1,19 +0,0 @@ -#!/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/share/man/man7/hier.7 b/share/man/man7/hier.7 index 00135bc0af3..6fb28026796 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hier.7,v 1.130 2014/08/23 07:25:54 jmc Exp $ +.\" $OpenBSD: hier.7,v 1.131 2014/08/26 19:33:48 robert Exp $ .\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: August 23 2014 $ +.Dd $Mdocdate: August 26 2014 $ .Dt HIER 7 .Os .Sh NAME @@ -117,9 +117,6 @@ System mail configuration files. .It mtree/ .Xr mtree 8 configuration files. -.It nginx/ -.Xr nginx 8 -configuration files. .It npppd/ .Xr npppd 8 configuration files. @@ -643,8 +640,8 @@ Periodically cleaned by Configuration files for .Xr unbound 8 . .It www/ -ServerRoot point for -.Xr nginx 8 . +Configuration files for +.Xr httpd 8 . .It yp/ Files for the .Xr yp 8 diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8 index cbae239924d..9782c3b2a28 100644 --- a/share/man/man8/intro.8 +++ b/share/man/man8/intro.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: intro.8,v 1.24 2014/08/23 07:25:54 jmc Exp $ +.\" $OpenBSD: intro.8,v 1.25 2014/08/26 19:33:48 robert Exp $ .\" $NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)intro.8 8.2 (Berkeley) 12/11/93 .\" -.Dd $Mdocdate: August 23 2014 $ +.Dd $Mdocdate: August 26 2014 $ .Dt INTRO 8 .Os .Sh NAME @@ -72,11 +72,11 @@ System daemons are controlled by the script which is in turn configured by .Xr rc.conf 8 . For example the HTTP daemon -.Xr nginx 8 +.Xr httpd 8 is controlled by the following line from .Xr rc.conf 8 : .Bd -literal -offset indent -nginx_flags=NO +httpd_flags=NO .Ed .Pp Thus it is not started by default. @@ -86,15 +86,11 @@ administrators should edit the file which overrides .Xr rc.conf 8 . So to enable -.Xr nginx 8 , +.Xr httpd 8 , the following line might be added to .Pa /etc/rc.conf.local : .Bd -literal -offset indent -nginx_flags="" -.Ed -or -.Bd -literal -offset indent -compact -nginx_flags="-u" +httpd_flags="" .Ed .Pp As can be seen above, @@ -185,7 +181,7 @@ Relevant .Xr rc.conf 8 variables: .Va rbootd_flags . -.Ss nginx web server (HTTP) +.Ss httpd web server (HTTP) On .Ox it will @@ -193,14 +189,14 @@ it will to .Pa /var/www . Detailed information is available in -.Xr nginx 8 +.Xr httpd 8 and -.Xr nginx.conf 5 . +.Xr httpd.conf 5 . .Pp Relevant .Xr rc.conf 8 variables: -.Va nginx_flags . +.Va httpd_flags . .Ss NFS server If this is an NFS server, edit diff --git a/share/man/man8/ssl.8 b/share/man/man8/ssl.8 index 4447dbf839d..04bd3855224 100644 --- a/share/man/man8/ssl.8 +++ b/share/man/man8/ssl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssl.8,v 1.57 2014/04/12 16:08:10 jmc Exp $ +.\" $OpenBSD: ssl.8,v 1.58 2014/08/26 19:33:48 robert Exp $ .\" .\" Copyright (c) 1999 Theo de Raadt, Bob Beck .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 12 2014 $ +.Dd $Mdocdate: August 26 2014 $ .Dt SSL 8 .Os .Sh NAME @@ -39,7 +39,7 @@ The SSL libraries (libssl and libcrypto) implement the SSL version 3 and TLS version 1 protocols. SSL and TLS are most commonly used by the HTTPS protocol for encrypted web transactions, as can be done with -.Xr nginx 8 . +.Xr httpd 8 . The libcrypto library is also used by various programs such as .Xr ssh 1 , .Xr sshd 8 , @@ -58,7 +58,7 @@ This is most commonly seen by users as the RSA routines failing in applications such as .Xr ssh 1 and -.Xr nginx 8 . +.Xr httpd 8 . .Pp It is important to remember when using a random data source for certificate and key generation that the random data source should not be visible by @@ -90,7 +90,7 @@ If a passphrase is not used, you will need to be absolutely sure your key file is kept secure. .Sh GENERATING RSA SERVER CERTIFICATES FOR WEB SERVERS To support HTTPS transactions in -.Xr nginx 8 +.Xr httpd 8 you will need to generate an RSA certificate. .Bd -literal -offset indent # openssl genrsa -out /etc/ssl/private/server.key 2048 @@ -127,7 +127,7 @@ With and .Pa /etc/ssl/private/server.key in place, you should be able to start -.Xr nginx 8 +.Xr httpd 8 with SSL configured, enabling HTTPS transactions with your machine on port 443. .Pp You will most likely want to generate a self-signed certificate in the @@ -139,7 +139,7 @@ you can switch to using the new certificate by replacing the self-signed .Pa /etc/ssl/server.crt with the certificate signed by your Certificate Authority, and then restarting -.Xr nginx 8 . +.Xr httpd 8 . .Sh GENERATING DSA SERVER CERTIFICATES Generating a DSA certificate involves several steps. First, generate parameters for DSA keys. @@ -226,7 +226,7 @@ to use SSL/TLS. .Xr ssl 3 , .Xr arandom 4 , .Xr isakmpd 8 , -.Xr nginx 8 , +.Xr httpd 8 , .Xr rc 8 , .Xr sendmail 8 , .Xr sshd 8 , |