Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

App Service: adding a disclaimer about a perpetual diff with Slots #829

Merged
merged 1 commit into from
Feb 14, 2018
Merged

App Service: adding a disclaimer about a perpetual diff with Slots #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions website/docs/r/app_service.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ description: |-

Manages an App Service (within an App Service Plan).

-> **Note:** When using Slots - the `app_settings`, `connection_string` and `site_config` blocks on the `azurerm_app_service` resource will be overwritten when promoting a Slot using the `azurerm_app_service_active_slot` resource.

## Example Usage (.net 4.x)

```hcl
Expand Down
9 changes: 5 additions & 4 deletions website/docs/r/app_service_active_slot.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ description: |-

Promotes an App Service Slot to Production within an App Service.

-> **Note:** When using Slots - the `app_settings`, `connection_string` and `site_config` blocks on the `azurerm_app_service` resource will be overwritten when promoting a Slot using the `azurerm_app_service_active_slot` resource.

## Example Usage

```hcl
Expand All @@ -35,9 +37,9 @@ resource "azurerm_app_service_slot" "test" {
}

resource "azurerm_app_service_active_slot" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
app_service_name = "${azurerm_app_service.test.name}"
source_slot_name = "${azurerm_app_service_slot.test.name}"
resource_group_name = "${azurerm_resource_group.test.name}"
app_service_name = "${azurerm_app_service.test.name}"
source_slot_name = "${azurerm_app_service_slot.test.name}"
}
```

Expand All @@ -50,4 +52,3 @@ The following arguments are supported:
* `app_service_name` - (Required) The name of the App Service within which the Slot exists. Changing this forces a new resource to be created.

* `app_service_slot_name` - (Required) The name of the App Service Slot which should be promoted to the Production Slot within the App Service.

2 changes: 1 addition & 1 deletion website/docs/r/app_service_plan.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: |-
Create an App Service Plan component.
---

# azurerm\_app\_service\_plan
# azurerm_app_service_plan

Create an App Service Plan component.

Expand Down
5 changes: 4 additions & 1 deletion website/docs/r/app_service_slot.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ description: |-

Manages an App Service Slot (within an App Service).

-> **Note:** When using Slots - the `app_settings`, `connection_string` and `site_config` blocks on the `azurerm_app_service` resource will be overwritten when promoting a Slot using the `azurerm_app_service_active_slot` resource.


## Example Usage (.net 4.x)

```hcl
Expand Down Expand Up @@ -194,7 +197,7 @@ The following arguments are supported:
* `remote_debugging_version` - (Optional) Which version of Visual Studio should the Remote Debugger be compatible with? Possible values are `VS2012`, `VS2013`, `VS2015` and `VS2017`.
* `use_32_bit_worker_process` - (Optional) Should the App Service Slot run in 32 bit mode, rather than 64 bit mode?

~> **Note:** Deployment Slots are not supported in the `Free`, `Shared`, or `Basic` App Service Plans.
~> **Note:** Deployment Slots are not supported in the `Free`, `Shared`, or `Basic` App Service Plans.

* `websockets_enabled` - (Optional) Should WebSockets be enabled?

Expand Down