From b00a2a38572fc0acb3c0722f66890546ff075821 Mon Sep 17 00:00:00 2001 From: Elan Date: Wed, 24 Jul 2019 15:20:01 -0700 Subject: [PATCH 1/3] Closes #429 SSL: adding support for origin_pull setting --- cloudflare/resource_cloudflare_page_rule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudflare/resource_cloudflare_page_rule.go b/cloudflare/resource_cloudflare_page_rule.go index 9d51eb53cc..dba17ff439 100644 --- a/cloudflare/resource_cloudflare_page_rule.go +++ b/cloudflare/resource_cloudflare_page_rule.go @@ -297,7 +297,7 @@ func resourceCloudflarePageRule() *schema.Resource { "ssl": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.StringInSlice([]string{"off", "flexible", "full", "strict"}, false), + ValidateFunc: validation.StringInSlice([]string{"off", "flexible", "full", "strict", "origin_pull"}, false), }, }, }, From 96e84f973f8b7c8b40d208e27799122b247589f3 Mon Sep 17 00:00:00 2001 From: Elan Date: Wed, 24 Jul 2019 15:20:01 -0700 Subject: [PATCH 2/3] Closes #429 SSL: adding support for origin_pull setting --- cloudflare/resource_cloudflare_page_rule.go | 2 +- website/docs/r/page_rule.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudflare/resource_cloudflare_page_rule.go b/cloudflare/resource_cloudflare_page_rule.go index 9d51eb53cc..dba17ff439 100644 --- a/cloudflare/resource_cloudflare_page_rule.go +++ b/cloudflare/resource_cloudflare_page_rule.go @@ -297,7 +297,7 @@ func resourceCloudflarePageRule() *schema.Resource { "ssl": { Type: schema.TypeString, Optional: true, - ValidateFunc: validation.StringInSlice([]string{"off", "flexible", "full", "strict"}, false), + ValidateFunc: validation.StringInSlice([]string{"off", "flexible", "full", "strict", "origin_pull"}, false), }, }, }, diff --git a/website/docs/r/page_rule.html.markdown b/website/docs/r/page_rule.html.markdown index 7baf97f50c..0160148412 100644 --- a/website/docs/r/page_rule.html.markdown +++ b/website/docs/r/page_rule.html.markdown @@ -76,7 +76,7 @@ Action blocks support the following: * `server_side_exclude` - (Optional) Whether this action is `"on"` or `"off"`. * `smart_errors` - (Optional) Whether this action is `"on"` or `"off"`. * `sort_query_string_for_cache` - (Optional) Whether this action is `"on"` or `"off"`. -* `ssl` - (Optional) Whether to set the SSL mode to `"off"`, `"flexible"`, `"full"`, or `"strict"`. +* `ssl` - (Optional) Whether to set the SSL mode to `"off"`, `"flexible"`, `"full"`, `"strict"`, or `"origin_pull"` * `true_client_ip_header` - (Optional) Whether this action is `"on"` or `"off"`. * `waf` - (Optional) Whether this action is `"on"` or `"off"`. From 1a921a6f82e6e38c29d8c71a7edb8d83532ed734 Mon Sep 17 00:00:00 2001 From: Jacob Bednarz Date: Thu, 25 Jul 2019 13:17:55 +1000 Subject: [PATCH 3/3] Add trailing period --- website/docs/r/page_rule.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/page_rule.html.markdown b/website/docs/r/page_rule.html.markdown index 0160148412..8d0674f1f0 100644 --- a/website/docs/r/page_rule.html.markdown +++ b/website/docs/r/page_rule.html.markdown @@ -76,7 +76,7 @@ Action blocks support the following: * `server_side_exclude` - (Optional) Whether this action is `"on"` or `"off"`. * `smart_errors` - (Optional) Whether this action is `"on"` or `"off"`. * `sort_query_string_for_cache` - (Optional) Whether this action is `"on"` or `"off"`. -* `ssl` - (Optional) Whether to set the SSL mode to `"off"`, `"flexible"`, `"full"`, `"strict"`, or `"origin_pull"` +* `ssl` - (Optional) Whether to set the SSL mode to `"off"`, `"flexible"`, `"full"`, `"strict"`, or `"origin_pull"`. * `true_client_ip_header` - (Optional) Whether this action is `"on"` or `"off"`. * `waf` - (Optional) Whether this action is `"on"` or `"off"`.