You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/active-directory/manage-apps/howto-saml-token-encryption.md
+2-7Lines changed: 2 additions & 7 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -13,12 +13,12 @@ ms.workload: identity
13
13
ms.tgt_pltfrm: na
14
14
ms.devlang: na
15
15
ms.topic: conceptual
16
-
ms.date: 02/06/2019
16
+
ms.date: 03/13/2020
17
17
ms.author: mimart
18
18
ms.reviewer: paulgarn
19
19
ms.collection: M365-identity-device-management
20
20
---
21
-
# How to: Configure Azure AD SAML token encryption (Preview)
21
+
# How to: Configure Azure AD SAML token encryption
22
22
23
23
> [!NOTE]
24
24
> Token encryption is an Azure Active Directory (Azure AD) premium feature. To learn more about Azure AD editions, features, and pricing, see [Azure AD pricing](https://azure.microsoft.com/pricing/details/active-directory/).
@@ -118,9 +118,6 @@ When you configure a keyCredential using Graph, PowerShell, or in the applicatio
118
118
119
119
### To configure token encryption using PowerShell
120
120
121
-
This functionality is coming soon.
122
-
123
-
<!--
124
121
1. Use the latest Azure AD PowerShell module to connect to your tenant.
125
122
126
123
1. Set the token encryption settings using the **[Set-AzureApplication](https://docs.microsoft.com/powershell/module/azuread/set-azureadapplication?view=azureadps-2.0-preview)** command.
@@ -137,8 +134,6 @@ This functionality is coming soon.
137
134
$app.TokenEncryptionKeyId
138
135
```
139
136
140
-
-->
141
-
142
137
### To configure token encryption using the application manifest
143
138
144
139
1. From the Azure portal, go to **Azure Active Directory > App registrations**.
Copy file name to clipboardExpand all lines: articles/automation/manage-runbooks.md
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,7 +27,7 @@ You can create a new runbook in Azure Automation using one of the Azure portals
27
27
28
28
### Create a runbook with PowerShell
29
29
30
-
You can use the [New-AzAutomationRunbook](https://docs.microsoft.com/powershell/module/az.automation/new-azautomationrunbook?view=azps-3.5.0) cmdlet to create an empty [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks). Use the *Type* parameter to specify one of the runbook types defined for **New-AzAutomationRunbook**.
30
+
You can use the [New-AzAutomationRunbook](https://docs.microsoft.com/powershell/module/az.automation/new-azautomationrunbook?view=azps-3.5.0) cmdlet to create an empty [PowerShell Workflow runbook](automation-runbook-types.md#powershell-workflow-runbooks). Use the `Type` parameter to specify one of the runbook types defined for `New-AzAutomationRunbook`.
31
31
32
32
The following example shows how to create a new empty runbook.
33
33
@@ -69,7 +69,7 @@ You can use the following procedure to import a script file into Azure Automatio
69
69
70
70
### Import a runbook from a script file with Windows PowerShell
71
71
72
-
Use the [Import-AzAutomationRunbook](https://docs.microsoft.com/powershell/module/az.automation/import-azautomationrunbook?view=azps-3.5.0) cmdlet to import a script file as a draft PowerShell Workflow runbook. If the runbook already exists, the import fails unless you use the *Force* parameter with the cmdlet.
72
+
Use the [Import-AzAutomationRunbook](https://docs.microsoft.com/powershell/module/az.automation/import-azautomationrunbook?view=azps-3.5.0) cmdlet to import a script file as a draft PowerShell Workflow runbook. If the runbook already exists, the import fails unless you use the `Force` parameter with the cmdlet.
73
73
74
74
The following example shows how to import a script file into a runbook.
When you test a runbook, the [Draft version](#publish-a-runbook) is executed and any actions that it performs are completed. No job history is created, but the [Output](automation-runbook-output-and-messages.md#output-stream) and [Warning and Error](automation-runbook-output-and-messages.md#message-streams) streams are displayed in the Test output pane. Messages to the [Verbose stream](automation-runbook-output-and-messages.md#message-streams) are displayed in the Output pane only if the *VerbosePreference* variable](automation-runbook-output-and-messages.md#preference-variables) is set to **Continue**.
89
+
When you test a runbook, the [Draft version](#publish-a-runbook) is executed and any actions that it performs are completed. No job history is created, but the [Output](automation-runbook-output-and-messages.md#output-stream) and [Warning and Error](automation-runbook-output-and-messages.md#message-streams) streams are displayed in the Test output pane. Messages to the [Verbose stream](automation-runbook-output-and-messages.md#message-streams) are displayed in the Output pane only if the `VerbosePreference` variable](automation-runbook-output-and-messages.md#preference-variables) is set to Continue.
90
90
91
91
Even though the draft version is being run, the runbook still executes normally and performs any actions against resources in the environment. For this reason, you should only test runbooks on non-production resources.
Copy file name to clipboardExpand all lines: articles/automation/source-control-integration.md
+20-20Lines changed: 20 additions & 20 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -27,10 +27,10 @@ Azure Automation supports three types of source control:
27
27
28
28
* A source control repository (GitHub or Azure Repos)
29
29
* A [Run As account](manage-runas-account.md)
30
-
* The [latest Azure modules](automation-update-azure-modules.md) in your Automation account, including the **Az.Accounts** module (Az module equivalent of AzureRM.Profile)
30
+
* The [latest Azure modules](automation-update-azure-modules.md) in your Automation account, including the `Az.Accounts` module (Az module equivalent of `AzureRM.Profile`)
31
31
32
32
> [!NOTE]
33
-
> Source control synchronization jobs run under the user's Automation account and are billed at the same rate as other Automation jobs.
33
+
> Source control synchronization jobs are run under the user's Automation account and are billed at the same rate as other Automation jobs.
34
34
35
35
## Configuring source control
36
36
@@ -48,15 +48,15 @@ Use this procedure to configure source control using the Azure portal.
48
48
49
49
3. A browser window opens and prompts you to sign in. Follow the prompts to complete authentication.
50
50
51
-
4. On the **Source Control Summary** page, use the fields to fill in the source control properties defined below. Click **Save** when finished.
51
+
4. On the Source Control Summary page, use the fields to fill in the source control properties defined below. Click **Save** when finished.
52
52
53
53
|Property |Description |
54
54
|---------|---------|
55
55
|Source control name | A friendly name for the source control. This name must contain only letters and numbers. |
56
-
|Source control type | Type of source control mechanism. Available options are:</br> GitHub</br>Azure Repos (Git)</br> Azure Repos (TFVC) |
56
+
|Source control type | Type of source control mechanism. Available options are:</br> * GitHub</br>*Azure Repos (Git)</br> * Azure Repos (TFVC) |
57
57
|Repository | Name of the repository or project. The first 200 repositories are retrieved. To search for a repository, type the name in the field and click **Search on GitHub**.|
58
58
|Branch | Branch from which to pull the source files. Branch targeting isn't available for the TFVC source control type. |
59
-
|Folder path | Folder that contains the runbooks to synchronize, for example, /Runbooks. Only runbooks in the specified folder are synchronized. Recursion isn't supported. |
59
+
|Folder path | Folder that contains the runbooks to synchronize, for example, **/Runbooks**. Only runbooks in the specified folder are synchronized. Recursion isn't supported. |
60
60
|Auto Sync<sup>1</sup> | Setting that turns on or off automatic synchronization when a commit is made in the source control repository. |
61
61
|Publish Runbook | Setting of On if runbooks are automatically published after synchronization from source control, and Off otherwise. |
62
62
|Description | Text specifying additional details about the source control. |
@@ -66,7 +66,7 @@ Use this procedure to configure source control using the Azure portal.
66
66
67
67
68
68
> [!NOTE]
69
-
> Your login for your source control repository might be different from your login for the Azure portal. Ensure that you are logged in with the correct account for your source control repository when configuring source control. If there is a doubt, open a new tab in your browser, log out from visualstudio.com or github.com, and try connecting to source control again.
69
+
> The login for your source control repository might be different from your login for the Azure portal. Ensure that you are logged in with the correct account for your source control repository when configuring source control. If there is a doubt, open a new tab in your browser, log out from **visualstudio.com** or **github.com**, and try connecting to source control again.
70
70
71
71
### Configure source control -- PowerShell
72
72
@@ -103,13 +103,13 @@ The following table defines the minimum PAT permissions required for GitHub. For
103
103
104
104
|Scope |Description |
105
105
|---------|---------|
106
-
|**repo**||
107
-
|repo:status| Access commit status |
108
-
|repo_deployment | Access deployment status |
109
-
|public_repo | Access public repositories |
110
-
|**admin:repo_hook**||
111
-
|write:repo_hook| Write repository hooks |
112
-
|read:repo_hook|Read repository hooks|
106
+
|**`repo`**||
107
+
|`repo:status`| Access commit status |
108
+
|`repo_deployment`| Access deployment status |
109
+
|`public_repo`| Access public repositories |
110
+
|**`admin:repo_hook`**||
111
+
|`write:repo_hook`| Write repository hooks |
112
+
|`read:repo_hook`|Read repository hooks|
113
113
114
114
##### Minimum PAT permissions for Azure Repos
115
115
@@ -122,15 +122,15 @@ The following list defines the minimum PAT permissions required for Azure Repos.
122
122
| Identity | Read |
123
123
| User profile | Read |
124
124
| Work items | Read |
125
-
| Service Connections| Read, query, manage<sup>1</sup> |
125
+
| Service connections| Read, query, manage<sup>1</sup> |
126
126
127
-
<sup>1</sup> The Service Connections permission is only required if you have enabled autosync.
127
+
<sup>1</sup> The Service connections permission is only required if you have enabled autosync.
128
128
129
129
## Synchronizing
130
130
131
-
Do the following to synchronize with source control.
131
+
Follow these steps to synchronize with source control.
132
132
133
-
1. Select the source from the table on the **Source control** page.
133
+
1. Select the source from the table on the Source control page.
134
134
135
135
2. Click **Start Sync** to start the sync process.
136
136
@@ -172,7 +172,7 @@ Do the following to synchronize with source control.
172
172
173
173
```
174
174
175
-
6. Additional logging is available by selecting **All Logs** on the **Source Control Sync Job Summary** page. These additional log entries can help you troubleshoot issues that might arise when using source control.
175
+
6. Additional logging is available by selecting **All Logs** on the Source Control Sync Job Summary page. These additional log entries can help you troubleshoot issues that might arise when using source control.
176
176
177
177
## Disconnecting source control
178
178
@@ -182,11 +182,11 @@ To disconnect from a source control repository:
182
182
183
183
2. Select the source control mechanism to remove.
184
184
185
-
3. On the **Source Control Summary** page, click **Delete**.
185
+
3. On the Source Control Summary page, click **Delete**.
186
186
187
187
## Handling encoding issues
188
188
189
-
If multiple people are editing runbooks in your source control repository using different editors, encoding issues can occur. To learn more about this situation, see [Common causes of encoding issues](/powershell/scripting/components/vscode/understanding-file-encoding#common-causes-of-encoding-issues)
189
+
If multiple people are editing runbooks in your source control repository using different editors, encoding issues can occur. To learn more about this situation, see [Common causes of encoding issues](/powershell/scripting/components/vscode/understanding-file-encoding#common-causes-of-encoding-issues).
When you create a function app, supply a valid **App name**, which can contain only letters, numbers, and hyphens. Underscore (**_**) is not an allowed character.
18
-
19
-
Storage account names must be between 3 and 24 characters in length and may contain numbers and lowercase letters only. Your storage account name must be unique within Azure.
20
-
21
17
After the function app is created, you can create individual functions in one or more different languages. Create functions [by using the portal](functions-create-first-azure-function.md#create-function), [continuous deployment](functions-continuous-deployment.md), or by [uploading with FTP](https://github.com/projectkudu/kudu/wiki/Accessing-files-via-ftp).
Copy file name to clipboardExpand all lines: articles/bastion/bastion-create-host-portal.md
+6-26Lines changed: 6 additions & 26 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
---
2
-
title: 'Create an Azure Bastion host | Microsoft Docs'
3
-
description: In this article, learn how to create an Azure Bastion host
2
+
title: 'Create an Azure Bastion host: portal'
3
+
description: In this article, learn how to create an Azure Bastion host using the portal
4
4
services: bastion
5
5
author: cherylmc
6
6
@@ -12,19 +12,19 @@ ms.author: cherylmc
12
12
13
13
---
14
14
15
-
# Create an Azure Bastion host
15
+
# Create an Azure Bastion host using the portal
16
16
17
17
This article shows you how to create an Azure Bastion host using the Azure portal. Once you provision the Azure Bastion service in your virtual network, the seamless RDP/SSH experience is available to all of the VMs in the same virtual network. Azure Bastion deployment is per virtual network, not per subscription/account or virtual machine.
18
18
19
-
You can create a new bastion host resource in the portal either by specifying all of the settings manually, or by using the settings that correspond to an existing VM. Optionally, you can use [Azure Powershell](bastion-create-host-powershell.md) to create an Azure Bastion host.
19
+
You can create a new bastion host resource in the portal either by specifying all of the settings manually, or by using the settings that correspond to an existing VM. To create a bastion host by using VM settings, see the [quickstart](quickstart-host-portal.md) article. Optionally, you can use [Azure PowerShell](bastion-create-host-powershell.md) to create an Azure Bastion host.
20
20
21
21
## Before you begin
22
22
23
23
Bastion is available in the following Azure public regions:
## <aname="createhost"></a>Create a bastion host - specify settings
27
+
## <aname="createhost"></a>Create a bastion host
28
28
29
29
This section helps you create a new Azure Bastion resource from the Azure portal.
30
30
@@ -41,7 +41,7 @@ This section helps you create a new Azure Bastion resource from the Azure portal
41
41
42
42
43
43
***Subscription**: The Azure subscription you want to use to create a new Bastion resource.
44
-
***Resource Group**: The Azure resource group in which the new Bastion resource will be created in. If you don’t have an existing resource group, you can create a new one.
44
+
***Resource Group**: The Azure resource group in which the new Bastion resource will be created in. If you don't have an existing resource group, you can create a new one.
45
45
***Name**: The name of the new Bastion resource
46
46
***Region**: The Azure public region that the resource will be created in.
47
47
***Virtual network**: The virtual network in which the Bastion resource will be created in. You can create a new virtual network in the portal during this process, or use an existing virtual network. If you are using an existing virtual network, make sure the existing virtual network has enough free address space to accommodate the Bastion subnet requirements.
@@ -57,26 +57,6 @@ This section helps you create a new Azure Bastion resource from the Azure portal
57
57
1. On the **Create a bastion** page, click **Create**.
58
58
1. You will see a message letting you know that your deployment is underway. Status will display on this page as the resources are created. It takes about 5 minutes for the Bastion resource to be created and deployed.
59
59
60
-
## <aname="createvmset"></a>Create a bastion host - use VM settings
61
-
62
-
If you create a bastion host in the portal by using an existing VM, various settings will automatically default to correspond to your virtual machine and/or virtual network.
63
-
64
-
1. Open the [Azure portal](https://portal.azure.com). Go to your virtual machine, then click **Connect**.
1. On the Bastion page, fill out the following settings fields:
71
-
72
-
***Name**: The name of the bastion host you want to create.
73
-
***Subnet**: The subnet inside your virtual network to which Bastion resource will be deployed. The subnet must be created with the name **AzureBastionSubnet**. This lets Azure know which subnet to deploy the Bastion resource to. This is different than a Gateway subnet. You must use a subnet of at least /27 or larger (/27, /26, and so on). Create the subnet without any Network Security Groups, route tables, or delegations. If you later choose to use Network Security Groups on the **AzureBastionSubnet**, see [Work with NSGs](bastion-nsg.md).
74
-
75
-
Click **Manage subnet configuration** to create the **AzureBastionSubnet**. Click **Create** to create the subnet, then proceed with the next settings.
76
-
***Public IP address**: The public IP of the Bastion resource on which RDP/SSH will be accessed (over port 443). Create a new public IP, or use an existing one. The public IP address must be in the same region as the Bastion resource you are creating.
77
-
***Public IP address name**: The name of the public IP address resource.
78
-
1. On the validation screen, click **Create**. Wait for about 5 minutes for the Bastion resource create and deploy.
79
-
80
60
## Next steps
81
61
82
62
* Read the [Bastion FAQ](bastion-faq.md) for additional information.
0 commit comments