From c636ed788ae3d2cf2c355ba77bd5f7c18b3a70e7 Mon Sep 17 00:00:00 2001 From: Vishesh Jindal Date: Wed, 30 Jan 2019 18:36:59 +0530 Subject: [PATCH 1/2] Fix cloudfront documentation formatting Signed-off-by: Vishesh Jindal (cherry picked from commit e1e72e9563743afc1649b23a2f651a7c3caaf369) Signed-off-by: Sebastiaan van Stijn --- docs/configuration.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 5b506758..646747e8 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -704,14 +704,19 @@ interpretation of the options. | `privatekey` | yes | The private key for Cloudfront, provided by AWS. | | `keypairid` | yes | The key pair ID provided by AWS. | | `duration` | no | An integer and unit for the duration of the Cloudfront session. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, or `h`. For example, `3000s` is valid, but `3000 s` is not. If you do not specify a `duration` or you specify an integer without a time unit, the duration defaults to `20m` (20 minutes).| -|`ipfilteredby`|no | A string with the following value `none|aws|awsregion`. | +|`ipfilteredby`|no | A string with the following value `none`, `aws` or `awsregion`. | |`awsregion`|no | A comma separated string of AWS regions, only available when `ipfilteredby` is `awsregion`. For example, `us-east-1, us-west-2`| |`updatefrenquency`|no | The frequency to update AWS IP regions, default: `12h`| |`iprangesurl`|no | The URL contains the AWS IP ranges information, default: `https://ip-ranges.amazonaws.com/ip-ranges.json`| -Then value of ipfilteredby: -`none`: default, do not filter by IP -`aws`: IP from AWS goes to S3 directly -`awsregion`: IP from certain AWS regions goes to S3 directly, use together with `awsregion` + + +Value of `ipfilteredby` can be: + +| Value | Description | +|-------------|------------------------------------| +| `none` | default, do not filter by IP | +| `aws` | IP from AWS goes to S3 directly | +| `awsregion` | IP from certain AWS regions goes to S3 directly, use together with `awsregion`. | ### `redirect` From f999f540d32d55561ff3f5f88a991be15ece4bd3 Mon Sep 17 00:00:00 2001 From: Adrian Plata Date: Tue, 26 Nov 2019 17:38:40 -0800 Subject: [PATCH 2/2] Fixing broken table Signed-off-by: Adrian Plata (cherry picked from commit b4694b0d2d3ce79e70143a50920a9e629e85c536) Signed-off-by: Sebastiaan van Stijn --- docs/configuration.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/configuration.md b/docs/configuration.md index 646747e8..23aaa81c 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -703,11 +703,11 @@ interpretation of the options. | `baseurl` | yes | The `SCHEME://HOST[/PATH]` at which Cloudfront is served. | | `privatekey` | yes | The private key for Cloudfront, provided by AWS. | | `keypairid` | yes | The key pair ID provided by AWS. | -| `duration` | no | An integer and unit for the duration of the Cloudfront session. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, or `h`. For example, `3000s` is valid, but `3000 s` is not. If you do not specify a `duration` or you specify an integer without a time unit, the duration defaults to `20m` (20 minutes).| -|`ipfilteredby`|no | A string with the following value `none`, `aws` or `awsregion`. | -|`awsregion`|no | A comma separated string of AWS regions, only available when `ipfilteredby` is `awsregion`. For example, `us-east-1, us-west-2`| -|`updatefrenquency`|no | The frequency to update AWS IP regions, default: `12h`| -|`iprangesurl`|no | The URL contains the AWS IP ranges information, default: `https://ip-ranges.amazonaws.com/ip-ranges.json`| +| `duration` | no | An integer and unit for the duration of the Cloudfront session. Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, or `h`. For example, `3000s` is valid, but `3000 s` is not. If you do not specify a `duration` or you specify an integer without a time unit, the duration defaults to `20m` (20 minutes). | +| `ipfilteredby` | no | A string with the following value `none`, `aws` or `awsregion`. | +| `awsregion` | no | A comma separated string of AWS regions, only available when `ipfilteredby` is `awsregion`. For example, `us-east-1, us-west-2` | +| `updatefrenquency` | no | The frequency to update AWS IP regions, default: `12h` | +| `iprangesurl` | no | The URL contains the AWS IP ranges information, default: `https://ip-ranges.amazonaws.com/ip-ranges.json` | Value of `ipfilteredby` can be: