diff options
| -rw-r--r-- | etc/mtree/4.4BSD.dist | 7 | ||||
| -rw-r--r-- | usr.sbin/httpd/conf/httpd.conf | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index c9502d1cc87..d4aabb2d3f4 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,4 +1,4 @@ -# $OpenBSD: 4.4BSD.dist,v 1.131 2002/07/07 14:24:04 matthieu Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.132 2002/07/11 12:19:31 markus Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -2174,6 +2174,11 @@ conf type=dir uname=root gname=daemon mode=755 #./www/conf .. +#./www/users +users type=dir uname=root gname=daemon mode=755 +#./www/users +.. + #./www .. diff --git a/usr.sbin/httpd/conf/httpd.conf b/usr.sbin/httpd/conf/httpd.conf index 9409196e1b4..535c1437fa8 100644 --- a/usr.sbin/httpd/conf/httpd.conf +++ b/usr.sbin/httpd/conf/httpd.conf @@ -333,17 +333,22 @@ DocumentRoot "/var/www/htdocs" # # UserDir: The name of the directory which is appended onto a user's home # directory if a ~user request is received. "disabled" turns this feature -# off; other reasonable defaults are "public_dir" and ".html" +# off. +# +# Since httpd will chroot(2) to the serverroot path by default, +# you should use +# UserDir /var/www/users +# and create per user directories in /var/www/users/<username> # UserDir disabled # # Control access to UserDir directories. The following is an example # for a site where these directories are restricted to read-only and -# are located under /home/<username>public_html +# are located under /users/<username> # You will need to change this to match your site's home directories. # -#<Directory /home/*/public_html> +#<Directory /users/*> # AllowOverride FileInfo AuthConfig Limit # Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec # <Limit GET POST OPTIONS PROPFIND> |