You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2006/01/07 01:01:52 UTC
svn commit: r366602 - in /httpd/httpd/branches/authz-dev/docs/conf:
extra/httpd-autoindex.conf.in extra/httpd-dav.conf.in
extra/httpd-info.conf.in extra/httpd-manual.conf.in
extra/httpd-multilang-errordoc.conf.in extra/httpd-userdir.conf.in
httpd.conf.in
Author: bnicholes
Date: Fri Jan 6 16:01:49 2006
New Revision: 366602
URL: http://svn.apache.org/viewcvs?rev=366602&view=rev
Log:
Update the configuration file templates to use the new authorization syntax
Modified:
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-autoindex.conf.in
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-dav.conf.in
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-info.conf.in
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-manual.conf.in
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-multilang-errordoc.conf.in
httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-userdir.conf.in
httpd/httpd/branches/authz-dev/docs/conf/httpd.conf.in
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-autoindex.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-autoindex.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-autoindex.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-autoindex.conf.in Fri Jan 6 16:01:49 2006
@@ -22,8 +22,7 @@
<Directory "@exp_iconsdir@">
Options Indexes MultiViews
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-dav.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-dav.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-dav.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-dav.conf.in Fri Jan 6 16:01:49 2006
@@ -24,6 +24,7 @@
# You can use the htdigest program to create the password database:
# htdigest -c "@@ServerRoot@@/user.passwd" DAV-upload admin
AuthUserFile "@@ServerRoot@@/user.passwd"
+ AuthDigestProvider file
# Allow universal read-access, but writes are restricted
# to the admin user.
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-info.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-info.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-info.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-info.conf.in Fri Jan 6 16:01:49 2006
@@ -12,9 +12,7 @@
<Location /server-status>
SetHandler server-status
- Order deny,allow
- Deny from all
- Allow from .example.com
+ Require host .example.com
</Location>
#
@@ -31,7 +29,5 @@
#
<Location /server-info>
SetHandler server-info
- Order deny,allow
- Deny from all
- Allow from .example.com
+ Require host .example.com
</Location>
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-manual.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-manual.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-manual.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-manual.conf.in Fri Jan 6 16:01:49 2006
@@ -12,8 +12,7 @@
<Directory "@exp_manualdir@">
Options Indexes
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
<Files *.html>
SetHandler type-map
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-multilang-errordoc.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-multilang-errordoc.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-multilang-errordoc.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-multilang-errordoc.conf.in Fri Jan 6 16:01:49 2006
@@ -26,8 +26,7 @@
Options IncludesNoExec
AddOutputFilter Includes html
AddHandler type-map var
- Order allow,deny
- Allow from all
+ Require all granted
LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
ForceLanguagePriority Prefer Fallback
</Directory>
Modified: httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-userdir.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-userdir.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-userdir.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/extra/httpd-userdir.conf.in Fri Jan 6 16:01:49 2006
@@ -17,12 +17,10 @@
AllowOverride FileInfo AuthConfig Limit Indexes
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
<Limit GET POST OPTIONS>
- Order allow,deny
- Allow from all
+ Require all granted
</Limit>
<LimitExcept GET POST OPTIONS>
- Order deny,allow
- Deny from all
+ Require all denied
</LimitExcept>
</Directory>
Modified: httpd/httpd/branches/authz-dev/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/conf/httpd.conf.in?rev=366602&r1=366601&r2=366602&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/authz-dev/docs/conf/httpd.conf.in Fri Jan 6 16:01:49 2006
@@ -112,8 +112,7 @@
<Directory />
Options FollowSymLinks
AllowOverride None
- Order deny,allow
- Deny from all
+ Require all denied
</Directory>
#
@@ -151,8 +150,7 @@
#
# Controls who can get stuff from this server.
#
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
@@ -169,9 +167,7 @@
# viewed by Web clients.
#
<FilesMatch "^\.ht">
- Order allow,deny
- Deny from all
- Satisfy All
+ Require all denied
</FilesMatch>
#
@@ -265,8 +261,7 @@
<Directory "@exp_cgidir@">
AllowOverride None
Options None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
#