On Wed, May 30, 2018 at 12:32:12AM +0200, Reyk Floeter wrote:
> Hi,
>
> this diff applies on top of the previous one.
>
> Rename "root strip" to "request strip"
>
> The root strip option name was semantically incorrect as it does not
> strip the root but the request path. This is a grammar change and it
> also needs a heads up and a change in other documentation (such as
> acme-client(1)).
>
This is the related documentation diff for the tree. Sorry for the
inconvenience, but it is better for the correctness of the grammar.
Reyk
Index: etc/examples/httpd.conf
===================================================================
RCS file: /cvs/src/etc/examples/httpd.conf,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 httpd.conf
--- etc/examples/httpd.conf 11 Apr 2018 15:51:50 -0000 1.19
+++ etc/examples/httpd.conf 29 May 2018 22:44:24 -0000
@@ -4,7 +4,7 @@ server "example.com" {
listen on * port 80
location "/.well-known/acme-challenge/*" {
root "/acme"
- root strip 2
+ request strip 2
}
location * {
block return 302 "https://$HTTP_HOST$REQUEST_URI";
@@ -22,6 +22,6 @@ server "example.com" {
}
location "/.well-known/acme-challenge/*" {
root "/acme"
- root strip 2
+ request strip 2
}
}
Index: usr.sbin/acme-client/acme-client.1
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/acme-client.1,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 acme-client.1
--- usr.sbin/acme-client/acme-client.1 17 Oct 2017 22:47:58 -0000 1.23
+++ usr.sbin/acme-client/acme-client.1 29 May 2018 22:44:24 -0000
@@ -83,7 +83,7 @@ which will properly map response challen
.Bd -literal -offset indent
location "/.well-known/acme-challenge/*" {
root "/acme"
- root strip 2
+ request strip 2
}
.Ed
.Sh FILES
Index: usr.sbin/acme-client/acme-client.conf.5
===================================================================
RCS file: /cvs/src/usr.sbin/acme-client/acme-client.conf.5,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 acme-client.conf.5
--- usr.sbin/acme-client/acme-client.conf.5 27 Nov 2017 01:58:52 -0000
1.11
+++ usr.sbin/acme-client/acme-client.conf.5 29 May 2018 22:44:24 -0000
@@ -169,7 +169,7 @@ server "example.com" {
tls key "/etc/ssl/private/example.com.key"
location "/.well-known/acme-challenge/*" {
root "/acme"
- root strip 2
+ request strip 2
}
root "/htdocs"
}
Index: regress/usr.sbin/acme-client/httpd.conf
===================================================================
RCS file: /cvs/src/regress/usr.sbin/acme-client/httpd.conf,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 httpd.conf
--- regress/usr.sbin/acme-client/httpd.conf 25 Jun 2017 21:33:23 -0000
1.1
+++ regress/usr.sbin/acme-client/httpd.conf 29 May 2018 22:44:24 -0000
@@ -3,6 +3,6 @@ server "default" {
listen on "*" port 80
location "/.well-known/acme-challenge/*" {
root "/acme"
- root strip 2
+ request strip 2
}
}
