Commit fca02154 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Update the configuration file templates to use the new authorization syntax 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366602 13f79535-47bb-0310-9956-ffa450edef68
parent b0806937

docs/conf/extra/httpd-autoindex.conf.in

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ Alias /icons/ "@exp_iconsdir@/" 
<Directory "@exp_iconsdir@">

    Options Indexes MultiViews

    AllowOverride None

    Order allow,deny

    Allow from all

    Require all granted

</Directory>



#

docs/conf/extra/httpd-dav.conf.in

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Alias /uploads "@@ServerRoot@@/uploads" 
    # 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.

docs/conf/extra/httpd-info.conf.in

+2 −6
Original line number Diff line number Diff line
@@ -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>

docs/conf/extra/httpd-manual.conf.in

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "@exp_manualdir@$ 
<Directory "@exp_manualdir@">

    Options Indexes

    AllowOverride None

    Order allow,deny

    Allow from all

    Require all granted



    <Files *.html>

        SetHandler type-map

docs/conf/extra/httpd-multilang-errordoc.conf.in

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ Alias /error/ "@exp_errordir@/" 
    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>