diff options
| -rw-r--r-- | etc/Makefile | 5 | ||||
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 99 | ||||
| -rw-r--r-- | etc/rc | 4 | ||||
| -rw-r--r-- | etc/rc.conf | 5 | ||||
| -rw-r--r-- | etc/rc.d/httpd | 15 |
5 files changed, 6 insertions, 122 deletions
diff --git a/etc/Makefile b/etc/Makefile index 4d2c83b4163..dd1b87401a1 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.345 2014/01/25 20:23:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.346 2014/03/13 10:11:01 florian Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -49,7 +49,7 @@ BIN2= motd # -r-xr-xr-x RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ - ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ + ftpd ftpproxy hostapd hotplugd identd ifstated iked \ 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 \ @@ -257,7 +257,6 @@ distribution-etc-root-var: distrib-dirs cd ../gnu/usr.sbin/sendmail/cf/cf && exec ${MAKE} distribution cd ../usr.sbin/ypserv/ypinit && exec ${MAKE} distribution cd ../usr.bin/ssh && exec ${MAKE} distribution - cd ../usr.sbin/httpd && exec ${MAKE} -f Makefile.bsd-wrapper distribution cd ../lib/libssl && exec ${MAKE} distribution cd ../gnu/usr.bin/lynx && exec ${MAKE} -f Makefile.bsd-wrapper distribution cd ../usr.bin/bgplg && exec ${MAKE} distribution diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index af82caf9883..b9651702ae8 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.241 2014/01/08 21:52:22 deraadt Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.242 2014/03/13 10:11:01 florian Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -374,29 +374,6 @@ rpcsvc gname=bin uname=root mode=0755 # ./usr/lib lib -# ./usr/lib/apache -apache gname=bin uname=root mode=0755 - - -# ./usr/lib/apache/modules -modules gname=bin uname=root mode=0755 -# ./usr/lib/apache/modules -.. - -# ./usr/lib/apache/include -include gname=bin uname=root mode=0755 - -# ./usr/lib/apache/include/xml -xml gname=bin uname=root mode=0755 -# ./usr/lib/apache/include/xml -.. - -# ./usr/lib/apache/include -.. - -# ./usr/lib/apache -.. - # ./usr/lib/debug debug gname=bin uname=root mode=0755 # ./usr/lib/debug @@ -682,53 +659,6 @@ milter # ./usr/share/doc/html/milter .. -# ./usr/share/doc/html/httpd -httpd type=dir uname=root gname=wheel mode=755 - -# ./usr/share/doc/html/httpd/mod -mod type=dir uname=root gname=wheel mode=755 - -# ./usr/share/doc/html/httpd/mod/mod_ssl -mod_ssl type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/mod/mod_ssl -.. - -# ./usr/share/doc/html/httpd/mod -.. - -# ./usr/share/doc/html/httpd/images -images type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/images -.. - -# ./usr/share/doc/html/httpd/vhosts -vhosts type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/vhosts -.. - -# ./usr/share/doc/html/httpd/misc -misc type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/misc -.. - -# ./usr/share/doc/html/httpd/search -search type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/search -.. - -# ./usr/share/doc/html/httpd/howto -howto type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/howto -.. - -# ./usr/share/doc/html/httpd/programs -programs type=dir uname=root gname=wheel mode=755 -# ./usr/share/doc/html/httpd/programs -.. - -# ./usr/share/doc/html/httpd -.. - # ./usr/share/doc/html .. @@ -1451,17 +1381,6 @@ dev type=dir uname=root gname=daemon mode=755 # ./www .. -# ./www/icons -icons type=dir uname=root gname=daemon mode=755 - -# ./www/icons/small -small type=dir uname=root gname=daemon mode=755 -# ./www/icons/small -.. - -# ./www/icons -.. - #./www/cgi-bin cgi-bin type=dir uname=root gname=daemon mode=755 #./www/cgi-bin @@ -1480,26 +1399,10 @@ logs type=dir uname=root gname=daemon mode=755 #./www/conf conf type=dir uname=root gname=daemon mode=755 -#./www/conf - -#./www/conf/modules -modules type=dir uname=root gname=daemon mode=755 -#./www/conf/modules -.. - -#./www/conf/modules.sample -modules.sample type=dir uname=root gname=daemon mode=755 -#./www/conf/modules.sample -.. #./www/conf .. -#./www/users -users type=dir uname=root gname=daemon mode=755 -#./www/users -.. - #./www/bin bin type=dir uname=root gname=daemon mode=755 #./www/bin @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.421 2014/02/19 21:47:15 schwarze Exp $ +# $OpenBSD: rc,v 1.422 2014/03/13 10:11:01 florian 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 rwhod lpd sendmail smtpd httpd slowcgi nginx ftpd +start_daemon hostapd rwhod lpd sendmail smtpd slowcgi nginx ftpd start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd start_daemon rbootd mopd spamd spamlogd kdc kadmind kpasswdd start_daemon ipropd_master ipropd_slave sndiod diff --git a/etc/rc.conf b/etc/rc.conf index 6f5fb1cd651..b52cec7151f 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.185 2014/03/12 18:21:34 tedu Exp $ +# $OpenBSD: rc.conf,v 1.186 2014/03/13 10:11:01 florian Exp $ # DO NOT EDIT THIS FILE!! # @@ -72,9 +72,6 @@ tftpproxy_flags=NO # for normal use: "" ldomd_flags=NO # for normal use: "" identd_flags=NO # for normal use: "-e" -# use -u to disable chroot, see httpd(8) -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: "" diff --git a/etc/rc.d/httpd b/etc/rc.d/httpd deleted file mode 100644 index 0dcf1c6a69e..00000000000 --- a/etc/rc.d/httpd +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: httpd,v 1.1 2011/07/06 18:55:36 robert Exp $ - -daemon="/usr/sbin/httpd" - -. /etc/rc.d/rc.subr - -pexp="httpd: parent.*" - -rc_pre() { - rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.* -} - -rc_cmd $1 |