1 --- docs/conf/httpd.conf.in	Fri Dec 21 03:43:00 2007

     2 +++ docs/conf/httpd.conf.in	Mon May 16 06:47:52 2011

     3 @@ -6,6 +6,12 @@

     4  # <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>

     5  # for a discussion of each configuration directive.

     6  #

     7 +# Solaris Quick Configuration Information

     8 +#

     9 +# 1. Set ServerName if necessary (default is 127.0.0.1)

    10 +# 2. Set ServerAdmin to a valid email address

    11 +#

    12 +#

    13  # Do NOT simply read the instructions in here without understanding

    14  # what they do.  They're here only as hints or reminders.  If you are unsure

    15  # consult the online docs. You have been warned.  

    16 @@ -44,14 +50,17 @@

    17  # Dynamic Shared Object (DSO) Support

    18  #

    19  # To be able to use the functionality of a module which was built as a DSO you

    20 -# have to place corresponding `LoadModule' lines at this location so the

    21 -# directives contained in it are actually available _before_ they are used.

    22 -# Statically compiled modules (those listed by `httpd -l') do not need

    23 -# to be loaded here.

    24 +# have to place corresponding `LoadModule' lines within the appropriate 

    25 +# (32-bit or 64-bit module) @rel_sysconfdir@/conf.d/modules-*.load file so that

    26 +# the directives contained in it are actually available _before_ they are used.

    27  #

    28 -# Example:

    29 -# LoadModule foo_module modules/mod_foo.so

    30 -#

    31 +<IfDefine 64bit>

    32 +Include @rel_sysconfdir@/conf.d/modules-64.load

    33 +</IfDefine>

    34 +<IfDefine !64bit>

    35 +Include @rel_sysconfdir@/conf.d/modules-32.load

    36 +</IfDefine>

    37 +

    38  @@LoadModule@@

    39  

    40  <IfModule !mpm_netware_module>

    41 @@ -64,8 +73,8 @@

    42  # It is usually good practice to create a dedicated user and group for

    43  # running httpd, as with most system services.

    44  #

    45 -User daemon

    46 -Group daemon

    47 +User webservd

    48 +Group webservd

    49  

    50  </IfModule>

    51  </IfModule>

    52 @@ -87,7 +96,7 @@

    53  # e-mailed.  This address appears on some server-generated pages, such

    54  # as error documents.  e.g. [email protected]

    55  #

    56 -ServerAdmin [email protected]

    57 +ServerAdmin [email protected]

    58  

    59  #

    60  # ServerName gives the name and port that the server uses to identify itself.

    61 @@ -96,7 +105,7 @@

    62  #

    63  # If your host doesn't have a registered DNS name, enter its IP address here.

    64  #

    65 -#ServerName www.example.com:@@Port@@

    66 +ServerName 127.0.0.1

    67  

    68  #

    69  # DocumentRoot: The directory out of which you will serve your

    70 @@ -330,6 +339,10 @@

    71      #

    72      #AddType text/html .shtml

    73      #AddOutputFilter INCLUDES .shtml

    74 +

    75 +    # Add a new mime.type for .p5i file extension so that clicking on 

    76 +    # this file type on a web page launches PackageManager in a Webinstall mode.

    77 +    AddType application/vnd.pkg5.info .p5i

    78  </IfModule>

    79  

    80  #

    81 @@ -370,43 +383,22 @@

    82  

    83  # Supplemental configuration

    84  #

    85 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be 

    86 -# included to add extra features or to modify the default configuration of 

    87 -# the server, or you may simply copy their contents here and change as 

    88 +# Include all the .conf configuration files in the 

    89 +# @rel_sysconfdir@/conf.d/ directory.

    90 +#

    91 +# You can place additional configuration files in the

    92 +# @rel_sysconfdir@/conf.d/ directory to add extra features

    93 +# or to modify the default configuration of the server,

    94 +# or you may simply copy their contents here and change as 

    95  # necessary.

    96 +#

    97 +# Sample configuration files are in the

    98 +# @rel_sysconfdir@/samples-conf.d directory. To use a 

    99 +# sample .conf file, copy it to  @rel_sysconfdir@/conf.d 

   100 +# directory and modify as required.

   101 +#

   102 +Include @rel_sysconfdir@/conf.d/*.conf

   103  

   104 -# Server-pool management (MPM specific)

   105 -#Include @rel_sysconfdir@/extra/httpd-mpm.conf

   106 -

   107 -# Multi-language error messages

   108 -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf

   109 -

   110 -# Fancy directory listings

   111 -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf

   112 -

   113 -# Language settings

   114 -#Include @rel_sysconfdir@/extra/httpd-languages.conf

   115 -

   116 -# User home directories

   117 -#Include @rel_sysconfdir@/extra/httpd-userdir.conf

   118 -

   119 -# Real-time info on requests and configuration

   120 -#Include @rel_sysconfdir@/extra/httpd-info.conf

   121 -

   122 -# Virtual hosts

   123 -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf

   124 -

   125 -# Local access to the Apache HTTP Server Manual

   126 -#Include @rel_sysconfdir@/extra/httpd-manual.conf

   127 -

   128 -# Distributed authoring and versioning (WebDAV)

   129 -#Include @rel_sysconfdir@/extra/httpd-dav.conf

   130 -

   131 -# Various default settings

   132 -#Include @rel_sysconfdir@/extra/httpd-default.conf

   133 -

   134 -# Secure (SSL/TLS) connections

   135 -#Include @rel_sysconfdir@/extra/httpd-ssl.conf

   136  #

   137  # Note: The following must must be present to support

   138  #       starting without SSL on platforms with no /dev/random equivalent