components/apache24/patches/httpd.conf.patch
changeset 3648 29c40c98aad3
parent 2079 46ce7840065c
equal deleted inserted replaced
3647:15356a4ccb21 3648:29c40c98aad3
    14 +#
    14 +#
    15 +#
    15 +#
    16  # Do NOT simply read the instructions in here without understanding
    16  # Do NOT simply read the instructions in here without understanding
    17  # what they do.  They're here only as hints or reminders.  If you are unsure
    17  # what they do.  They're here only as hints or reminders.  If you are unsure
    18  # consult the online docs. You have been warned.  
    18  # consult the online docs. You have been warned.  
    19 @@ -63,6 +69,12 @@
    19 @@ -63,6 +69,15 @@
    20  # Example:
    20  # Example:
    21  # LoadModule foo_module modules/mod_foo.so
    21  # LoadModule foo_module modules/mod_foo.so
    22  #
    22  #
    23 +# Note that mod_authn_dbd.so, mod_authz_dbd.so, mod_dbd.so and
    23 +# Note that mod_authn_dbd.so, mod_authz_dbd.so, mod_dbd.so and
    24 +# mod_session_dbd.so are bundled in separate package "apache-dbd".
    24 +# mod_session_dbd.so are bundled in separate package "apache-dbd".
    25 +# Similarly mod_authnz_ldap.so and mod_ldap.so are bundled in
    25 +# Similarly mod_authnz_ldap.so and mod_ldap.so are bundled in
    26 +# separate package "apache-ldap".
    26 +# separate package "apache-ldap".
       
    27 +# Also mediated symbolic link mod_ssl.so pointing to mod_ssl-default.so
       
    28 +# or mod_ssl-fips-140.so is bundled in separate package "apache-ssl"
       
    29 +# respectively "apache-ssl-fips-140" package.
    27 +# And finally mod_lua.so is bundled in separate package "apache-lua".
    30 +# And finally mod_lua.so is bundled in separate package "apache-lua".
    28 +#
    31 +#
    29  @@LoadModule@@
    32  @@LoadModule@@
    30  
    33  
    31  <IfModule unixd_module>
    34  <IfModule unixd_module>
    32 @@ -74,8 +86,8 @@
    35 @@ -74,8 +89,8 @@
    33  # It is usually good practice to create a dedicated user and group for
    36  # It is usually good practice to create a dedicated user and group for
    34  # running httpd, as with most system services.
    37  # running httpd, as with most system services.
    35  #
    38  #
    36 -User daemon
    39 -User daemon
    37 -Group daemon
    40 -Group daemon
    38 +User webservd
    41 +User webservd
    39 +Group webservd
    42 +Group webservd
    40  
    43  
    41  </IfModule>
    44  </IfModule>
    42  
    45  
    43 @@ -96,7 +108,7 @@
    46 @@ -96,7 +111,7 @@
    44  # e-mailed.  This address appears on some server-generated pages, such
    47  # e-mailed.  This address appears on some server-generated pages, such
    45  # as error documents.  e.g. [email protected]
    48  # as error documents.  e.g. [email protected]
    46  #
    49  #
    47 -ServerAdmin [email protected]
    50 -ServerAdmin [email protected]
    48 +ServerAdmin [email protected]
    51 +ServerAdmin [email protected]
    49  
    52  
    50  #
    53  #
    51  # ServerName gives the name and port that the server uses to identify itself.
    54  # ServerName gives the name and port that the server uses to identify itself.
    52 @@ -105,7 +117,7 @@
    55 @@ -105,7 +120,7 @@
    53  #
    56  #
    54  # If your host doesn't have a registered DNS name, enter its IP address here.
    57  # If your host doesn't have a registered DNS name, enter its IP address here.
    55  #
    58  #
    56 -#ServerName www.example.com:@@Port@@
    59 -#ServerName www.example.com:@@Port@@
    57 +ServerName 127.0.0.1
    60 +ServerName 127.0.0.1
    58  
    61  
    59  #
    62  #
    60  # Deny access to the entirety of your server's filesystem. You must
    63  # Deny access to the entirety of your server's filesystem. You must
    61 @@ -314,6 +326,10 @@
    64 @@ -314,6 +329,10 @@
    62      #
    65      #
    63      #AddType text/html .shtml
    66      #AddType text/html .shtml
    64      #AddOutputFilter INCLUDES .shtml
    67      #AddOutputFilter INCLUDES .shtml
    65 +
    68 +
    66 +    # Add a new mime.type for .p5i file extension so that clicking on 
    69 +    # Add a new mime.type for .p5i file extension so that clicking on 
    67 +    # this file type on a web page launches PackageManager in a Webinstall mode.
    70 +    # this file type on a web page launches PackageManager in a Webinstall mode.
    68 +    AddType application/vnd.pkg5.info .p5i
    71 +    AddType application/vnd.pkg5.info .p5i
    69  </IfModule>
    72  </IfModule>
    70  
    73  
    71  #
    74  #
    72 @@ -355,48 +371,22 @@
    75 @@ -355,48 +374,22 @@
    73  
    76  
    74  # Supplemental configuration
    77  # Supplemental configuration
    75  #
    78  #
    76 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be 
    79 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be 
    77 -# included to add extra features or to modify the default configuration of 
    80 -# included to add extra features or to modify the default configuration of