OpenBSD CVS

CVS log for src/etc/examples/httpd.conf


[BACK] Up to [local] / src / etc / examples

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.22 / (download) - annotate - [select for diffs], Wed Nov 4 10:34:18 2020 UTC (3 years, 7 months ago) by denis
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, HEAD
Changes since 1.21: +3 -3 lines
Diff to previous 1.21 (colored)

Back out last commit.

Some devs are not convinced.

Revision 1.21 / (download) - annotate - [select for diffs], Mon Nov 2 20:30:41 2020 UTC (3 years, 7 months ago) by denis
Branch: MAIN
Changes since 1.20: +3 -3 lines
Diff to previous 1.20 (colored)

acme response challenge location to issue better error code

Notified to me by jmc@

Diff by Matthias Pressfreund <mpfr @ fn de>, thanks

Revision 1.20 / (download) - annotate - [select for diffs], Wed Jun 13 15:08:24 2018 UTC (5 years, 11 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

Rename httpd.conf "root strip" option to "request strip".

"root strip" was semantically incorrect and did cause some confusion
as it never stripped the root but the client's request path.

Discussed with many.  Heads up: this is a grammar change that also
affects acme-client(1) configurations (see current.html).

OK claudio@

Revision 1.19 / (download) - annotate - [select for diffs], Wed Apr 11 15:51:50 2018 UTC (6 years, 1 month ago) by florian
Branch: MAIN
Changes since 1.18: +1 -3 lines
Diff to previous 1.18 (colored)

"listen on * port 80" means all v4 and v6 addresses these days.
OK benno

Revision 1.18 / (download) - annotate - [select for diffs], Fri Mar 23 11:36:41 2018 UTC (6 years, 2 months ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.17: +21 -73 lines
Diff to previous 1.17 (colored)

Provide an example httpd.conf that's actually useful.
With & OK deraadt
input sthen
looks better to beck
OK benno

Revision 1.17 / (download) - annotate - [select for diffs], Sun Apr 16 08:50:49 2017 UTC (7 years, 1 month ago) by ajacoutot
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2
Changes since 1.16: +3 -3 lines
Diff to previous 1.16 (colored)

Remove /etc/ssl/acme/. We don't need it now that we have a default acme-conf(5)
that direclty uses /etc/ssl/{,private} by default. Adapt the httpd.conf example
accordingly.

ok florian@ benno@ millert@

Revision 1.16 / (download) - annotate - [select for diffs], Sat Sep 17 20:05:59 2016 UTC (7 years, 8 months ago) by tj
Branch: MAIN
CVS Tags: OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.15: +3 -3 lines
Diff to previous 1.15 (colored)

pathnames for cert and key files need to be quoted.

reported by brynet

Revision 1.15 / (download) - annotate - [select for diffs], Sat Sep 17 15:04:15 2016 UTC (7 years, 8 months ago) by tj
Branch: MAIN
Changes since 1.14: +5 -1 lines
Diff to previous 1.14 (colored)

add example certificate and key files generated with acme-client.

ok florian

Revision 1.14 / (download) - annotate - [select for diffs], Wed Feb 4 08:39:35 2015 UTC (9 years, 4 months ago) by florian
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9, OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

Typo
From Michael (lesniewskister AT gmail), thanks!

Revision 1.13 / (download) - annotate - [select for diffs], Sun Dec 28 13:55:22 2014 UTC (9 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 (colored)

Change the default ext_addr from "egress" to "*".  Listening on the
egress group only works if you have a default route; this confused
some people.

Revision 1.12 / (download) - annotate - [select for diffs], Fri Dec 12 14:45:59 2014 UTC (9 years, 5 months ago) by reyk
Branch: MAIN
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

Like previously done in relayd, change the keyword "ssl" to "tls" to
reflect reality.

OK benno@

Revision 1.11 / (download) - annotate - [select for diffs], Mon Aug 25 14:27:54 2014 UTC (9 years, 9 months ago) by reyk
Branch: MAIN
Changes since 1.10: +6 -1 lines
Diff to previous 1.10 (colored)

Add a generic system-wide /usr/share/misc/mime.types file that can be
included in httpd.conf.  httpd(8) now supports both mime.types
flavours with or without semicolon at the end of the line (nginx- or
apache-style).

Discussed with many, with input from halex@
OK halex@

Revision 1.10 / (download) - annotate - [select for diffs], Wed Aug 6 20:29:54 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

Change grammar to remove a shift/reduce conflict that was introduced
with the ssl options.
"listen on $ip port 443 ssl" turns into "listen on $ip ssl port 443".

ok florian@

Revision 1.9 / (download) - annotate - [select for diffs], Tue Aug 5 18:01:10 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.8: +8 -1 lines
Diff to previous 1.8 (colored)

Add configuration options for the most-important connection limits:
max requests (per connection) and timeout.  We don't want to add too
many button, and there are good defaults, but these ones are kind of
mandatory.

Revision 1.8 / (download) - annotate - [select for diffs], Mon Aug 4 17:50:48 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.7: +7 -1 lines
Diff to previous 1.7 (colored)

Add HTTPS server example.

Revision 1.7 / (download) - annotate - [select for diffs], Mon Aug 4 16:07:59 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

Change grammar from "log [style]" to "log style [style]".

Revision 1.6 / (download) - annotate - [select for diffs], Sun Aug 3 11:51:40 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.5: +14 -5 lines
Diff to previous 1.5 (colored)

The first server example should be the "minimal default" to illustrate
that you don't have to push all kinds of buttons to run httpd.

Revision 1.5 / (download) - annotate - [select for diffs], Sun Aug 3 11:28:58 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.4: +17 -1 lines
Diff to previous 1.4 (colored)

More examples, include FastCGI for php and cgi-bin and logging.

Revision 1.4 / (download) - annotate - [select for diffs], Wed Jul 30 10:05:14 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.3: +4 -1 lines
Diff to previous 1.3 (colored)

Add "location" keyword to specify path-specific configuration in
servers, for example auto index for a sub-directory only.  Internally,
a "location" is just a special type of a "virtual" server.

Revision 1.3 / (download) - annotate - [select for diffs], Tue Jul 29 16:17:28 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.2: +2 -1 lines
Diff to previous 1.2 (colored)

Add extended directory index options: "[no] index" and "[no] auto index".
The option "directory auto index" implements basic directory listing
and is turned off by default.

ok deraadt@

Revision 1.2 / (download) - annotate - [select for diffs], Sat Jul 26 10:27:19 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN
Changes since 1.1: +19 -1 lines
Diff to previous 1.1 (colored)

Add more examples.  Requested by deraadt@

Revision 1.1 / (download) - annotate - [select for diffs], Tue Jul 22 16:58:21 2014 UTC (9 years, 10 months ago) by reyk
Branch: MAIN

Add initial httpd.conf(5) example for httpd(8)

Requested by deraadt@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.