You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sl...@apache.org on 2005/04/02 20:27:43 UTC

svn commit: r159788 - in httpd/httpd/branches/simple-conf/docs/conf: extra/httpd-autoindex.conf httpd-std.conf.in

Author: slive
Date: Sat Apr  2 10:27:43 2005
New Revision: 159788

URL: http://svn.apache.org/viewcvs?view=rev&rev=159788
Log:
Move mod_autoindex config to extra/

Added:
    httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-autoindex.conf
Modified:
    httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in

Added: httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-autoindex.conf
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-autoindex.conf?view=auto&rev=159788
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-autoindex.conf (added)
+++ httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-autoindex.conf Sat Apr  2 10:27:43 2005
@@ -0,0 +1,93 @@
+#
+# Directives controlling the display of server-generated directory listings.
+#
+# Required modules: mod_autoindex, mod_alias
+#
+# To see the listing of a directory, the Options directive for the
+# directory must include "Indexes", and the directory must not contain
+# a file matching those listed in the DirectoryIndex directive.
+#
+
+#
+# IndexOptions: Controls the appearance of server-generated directory
+# listings.
+#
+IndexOptions FancyIndexing VersionSort
+
+# We include the /icons/ alias for FancyIndexed directory listings.  If
+# you do not use FancyIndexing, you may comment this out.
+#
+Alias /icons/ "@exp_iconsdir@/"
+
+<Directory "@exp_iconsdir@">
+    Options Indexes MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</Directory>
+
+#
+# AddIcon* directives tell the server which icon to show for different
+# files or filename extensions.  These are only displayed for
+# FancyIndexed directories.
+#
+AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
+
+AddIconByType (TXT,/icons/text.gif) text/*
+AddIconByType (IMG,/icons/image2.gif) image/*
+AddIconByType (SND,/icons/sound2.gif) audio/*
+AddIconByType (VID,/icons/movie.gif) video/*
+
+AddIcon /icons/binary.gif .bin .exe
+AddIcon /icons/binhex.gif .hqx
+AddIcon /icons/tar.gif .tar
+AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
+AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
+AddIcon /icons/a.gif .ps .ai .eps
+AddIcon /icons/layout.gif .html .shtml .htm .pdf
+AddIcon /icons/text.gif .txt
+AddIcon /icons/c.gif .c
+AddIcon /icons/p.gif .pl .py
+AddIcon /icons/f.gif .for
+AddIcon /icons/dvi.gif .dvi
+AddIcon /icons/uuencoded.gif .uu
+AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+AddIcon /icons/tex.gif .tex
+AddIcon /icons/bomb.gif core
+
+AddIcon /icons/back.gif ..
+AddIcon /icons/hand.right.gif README
+AddIcon /icons/folder.gif ^^DIRECTORY^^
+AddIcon /icons/blank.gif ^^BLANKICON^^
+
+#
+# DefaultIcon is which icon to show for files which do not have an icon
+# explicitly set.
+#
+DefaultIcon /icons/unknown.gif
+
+#
+# AddDescription allows you to place a short description after a file in
+# server-generated indexes.  These are only displayed for FancyIndexed
+# directories.
+# Format: AddDescription "description" filename
+#
+#AddDescription "GZIP compressed document" .gz
+#AddDescription "tar archive" .tar
+#AddDescription "GZIP compressed tar archive" .tgz
+
+#
+# ReadmeName is the name of the README file the server will look for by
+# default, and append to directory listings.
+#
+# HeaderName is the name of a file which should be prepended to
+# directory indexes. 
+ReadmeName README.html
+HeaderName HEADER.html
+
+#
+# IndexIgnore is a set of filenames which directory indexing should ignore
+# and not include in the listing.  Shell-style wildcarding is permitted.
+#
+IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
+

Modified: httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in?view=diff&r1=159787&r2=159788
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/httpd-std.conf.in Sat Apr  2 10:27:43 2005
@@ -559,17 +559,6 @@
     # realname must also be slash terminated, and if the fakename omits the 
     # trailing slash, the realname must also omit it.
     #
-    # We include the /icons/ alias for FancyIndexed directory listings.  If
-    # you do not use FancyIndexing, you may comment this out.
-    #
-    Alias /icons/ "@exp_iconsdir@/"
-
-    <Directory "@exp_iconsdir@">
-        Options Indexes MultiViews
-        AllowOverride None
-        Order allow,deny
-        Allow from all
-    </Directory>
 
     #
     # This should be changed to the ServerRoot/manual/.  The alias provides
@@ -631,82 +620,6 @@
 # Example:
 # Redirect permanent /foo http://www.example.com/bar
 
-#
-# Directives controlling the display of server-generated directory listings.
-#
-<IfModule autoindex_module>
-
-    #
-    # IndexOptions: Controls the appearance of server-generated directory
-    # listings.
-    #
-    IndexOptions FancyIndexing VersionSort
-
-    #
-    # AddIcon* directives tell the server which icon to show for different
-    # files or filename extensions.  These are only displayed for
-    # FancyIndexed directories.
-    #
-    AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
-    AddIconByType (TXT,/icons/text.gif) text/*
-    AddIconByType (IMG,/icons/image2.gif) image/*
-    AddIconByType (SND,/icons/sound2.gif) audio/*
-    AddIconByType (VID,/icons/movie.gif) video/*
-
-    AddIcon /icons/binary.gif .bin .exe
-    AddIcon /icons/binhex.gif .hqx
-    AddIcon /icons/tar.gif .tar
-    AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-    AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-    AddIcon /icons/a.gif .ps .ai .eps
-    AddIcon /icons/layout.gif .html .shtml .htm .pdf
-    AddIcon /icons/text.gif .txt
-    AddIcon /icons/c.gif .c
-    AddIcon /icons/p.gif .pl .py
-    AddIcon /icons/f.gif .for
-    AddIcon /icons/dvi.gif .dvi
-    AddIcon /icons/uuencoded.gif .uu
-    AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-    AddIcon /icons/tex.gif .tex
-    AddIcon /icons/bomb.gif core
-
-    AddIcon /icons/back.gif ..
-    AddIcon /icons/hand.right.gif README
-    AddIcon /icons/folder.gif ^^DIRECTORY^^
-    AddIcon /icons/blank.gif ^^BLANKICON^^
-
-    #
-    # DefaultIcon is which icon to show for files which do not have an icon
-    # explicitly set.
-    #
-    DefaultIcon /icons/unknown.gif
-
-    #
-    # AddDescription allows you to place a short description after a file in
-    # server-generated indexes.  These are only displayed for FancyIndexed
-    # directories.
-    # Format: AddDescription "description" filename
-    #
-    #AddDescription "GZIP compressed document" .gz
-    #AddDescription "tar archive" .tar
-    #AddDescription "GZIP compressed tar archive" .tgz
-
-    #
-    # ReadmeName is the name of the README file the server will look for by
-    # default, and append to directory listings.
-    #
-    # HeaderName is the name of a file which should be prepended to
-    # directory indexes. 
-    ReadmeName README.html
-    HeaderName HEADER.html
-
-    #
-    # IndexIgnore is a set of filenames which directory indexing should ignore
-    # and not include in the listing.  Shell-style wildcarding is permitted.
-    #
-    IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-</IfModule>
 
 <IfModule mime_module>
 
@@ -1031,4 +944,7 @@
 # here and change as necessary.
 
 # Multi-language error messages
-# Include extra/httpd-multilang-error.conf
\ No newline at end of file
+# Include extra/httpd-multilang-error.conf
+
+# Fancy directory listings
+# Include extra/httpd-autoindex.conf
\ No newline at end of file