diff options
Diffstat (limited to 'httpd/httpd.conf.5')
| -rw-r--r-- | httpd/httpd.conf.5 | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/httpd/httpd.conf.5 b/httpd/httpd.conf.5 index b3eaad8..859f68f 100644 --- a/httpd/httpd.conf.5 +++ b/httpd/httpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: httpd.conf.5,v 1.64 2015/07/15 17:10:47 jsing Exp $ +.\" $OpenBSD: httpd.conf.5,v 1.66 2015/07/18 06:00:43 reyk Exp $ .\" .\" Copyright (c) 2014, 2015 Reyk Floeter <reyk@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 15 2015 $ +.Dd $Mdocdate: July 18 2015 $ .Dt HTTPD.CONF 5 .Os .Sh NAME @@ -112,6 +112,15 @@ directory. If not specified, it defaults to .Pa /var/www , the home directory of the www user. +.It Ic default type Ar type/subtype +Set the default media type that is used if the media type for a +specified extension is not found in the configured types or for files +without a file extension; +see the +.Sx TYPES +section below. +If not specified, the default type is set to +.Ar application/octet-stream . .It Ic logdir Ar directory Specifies the full path of the directory in which log files will be written. If not specified, it defaults to @@ -236,6 +245,9 @@ Specify the inactivity timeout in seconds for accepted sessions. The default timeout is 600 seconds (10 minutes). The maximum is 2147483647 seconds (68 years). .El +.It Ic default type Ar type/subtype +Set the default media type for the specified location, +overwriting the global setting. .It Ic directory Ar option Set the specified options when serving or accessing directories. Valid options are: @@ -262,6 +274,18 @@ root directory of .Xr httpd 8 and defaults to .Pa /run/slowcgi.sock . +.It Ic hsts Oo Ar option Oc +Enable HTTP Strict Transport Security. +Valid options are: +.Bl -tag -width Ds +.It Ic max-age Ar seconds +Set the maximum time in seconds a receiving user agent should regard +this host as a HSTS host. +The default is one year. +.It Ic subdomains +Signal to the receiving user agent that this host and all sub domains +of the host's domain should be considered HSTS hosts. +.El .It Ic listen on Ar address Oo Ic tls Oc Ic port Ar number Set the listen address and port. This statement can be specified multiple times. |