components/web/apache24/patches/httpd.conf.patch

   1 --- docs/conf/httpd.conf.in.~1~ 2019-03-01 00:26:03.160010678 +0000
   2 +++ docs/conf/httpd.conf.in     2019-03-01 00:26:09.538521851 +0000
   3 @@ -6,6 +6,12 @@
   4  # <URL:http://httpd.apache.org/docs/2.4/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 @@ -74,8 +80,8 @@
  17  # It is usually good practice to create a dedicated user and group for
  18  # running httpd, as with most system services.
  19  #
  20 -User daemon
  21 -Group daemon
  22 +User webservd
  23 +Group webservd
  24
  25  </IfModule>
  26
  27 @@ -96,7 +102,7 @@
  28  # e-mailed.  This address appears on some server-generated pages, such
  29  # as error documents.  e.g. admin@your-domain.com
  30  #
  31 -ServerAdmin you@example.com
  32 +ServerAdmin you@yourhost.com
  33
  34  #
  35  # ServerName gives the name and port that the server uses to identify itself.
  36 @@ -105,7 +111,7 @@
  37  #
  38  # If your host doesn't have a registered DNS name, enter its IP address here.
  39  #
  40 -#ServerName www.example.com:@@Port@@
  41 +ServerName 127.0.0.1
  42
  43  #
  44  # Deny access to the entirety of your server's filesystem. You must
  45 @@ -323,6 +329,10 @@
  46      #
  47      #AddType text/html .shtml
  48      #AddOutputFilter INCLUDES .shtml
  49 +
  50 +    # Add a new mime.type for .p5i file extension so that clicking on
  51 +    # this file type on a web page launches PackageManager in a Webinstall mode.
  52 +    AddType application/vnd.pkg5.info .p5i
  53  </IfModule>
  54
  55  #
  56 @@ -364,48 +374,22 @@
  57
  58  # Supplemental configuration
  59  #
  60 -# The configuration files in the @rel_sysconfdir@/extra/ directory can be
  61 -# included to add extra features or to modify the default configuration of
  62 -# the server, or you may simply copy their contents here and change as
  63 +# Include all the .conf configuration files in the
  64 +# @rel_sysconfdir@/conf.d/ directory.
  65 +#
  66 +# You can place additional configuration files in the
  67 +# @rel_sysconfdir@/conf.d/ directory to add extra features
  68 +# or to modify the default configuration of the server,
  69 +# or you may simply copy their contents here and change as
  70  # necessary.
  71 +#
  72 +# Sample configuration files are in the
  73 +# @rel_sysconfdir@/samples-conf.d directory. To use a
  74 +# sample .conf file, copy it to  @rel_sysconfdir@/conf.d
  75 +# directory and modify as required.
  76 +#
  77 +IncludeOptional @rel_sysconfdir@/conf.d/*.conf
  78
  79 -# Server-pool management (MPM specific)
  80 -#Include @rel_sysconfdir@/extra/httpd-mpm.conf
  81 -
  82 -# Multi-language error messages
  83 -#Include @rel_sysconfdir@/extra/httpd-multilang-errordoc.conf
  84 -
  85 -# Fancy directory listings
  86 -#Include @rel_sysconfdir@/extra/httpd-autoindex.conf
  87 -
  88 -# Language settings
  89 -#Include @rel_sysconfdir@/extra/httpd-languages.conf
  90 -
  91 -# User home directories
  92 -#Include @rel_sysconfdir@/extra/httpd-userdir.conf
  93 -
  94 -# Real-time info on requests and configuration
  95 -#Include @rel_sysconfdir@/extra/httpd-info.conf
  96 -
  97 -# Virtual hosts
  98 -#Include @rel_sysconfdir@/extra/httpd-vhosts.conf
  99 -
 100 -# Local access to the Apache HTTP Server Manual
 101 -#Include @rel_sysconfdir@/extra/httpd-manual.conf
 102 -
 103 -# Distributed authoring and versioning (WebDAV)
 104 -#Include @rel_sysconfdir@/extra/httpd-dav.conf
 105 -
 106 -# Various default settings
 107 -#Include @rel_sysconfdir@/extra/httpd-default.conf
 108 -
 109 -# Configure mod_proxy_html to understand HTML4/XHTML1
 110 -<IfModule proxy_html_module>
 111 -Include @rel_sysconfdir@/extra/proxy-html.conf
 112 -</IfModule>
 113 -
 114 -# Secure (SSL/TLS) connections
 115 -#Include @rel_sysconfdir@/extra/httpd-ssl.conf
 116  #
 117  # Note: The following must must be present to support
 118  #       starting without SSL on platforms with no /dev/random equivalent