Skip to content

Commit ec2eacb

Browse files
huypubhuypub
authored
Merge pull request #99883 from MicrosoftDocs/master
12/30 PM Publish
2 parents e8f48ad + 7cc4eae commit ec2eacb

File tree

87 files changed

+1157
-1215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1157
-1215
lines changed

‎.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24185,6 +24185,11 @@
2418524185
"redirect_url": "/azure/storage/common/storage-auth-aad-rbac-portal",
2418624186
"redirect_document_id": true
2418724187
},
24188+
{
24189+
"source_path": "articles/storage/common/storage-auth-aad-script.md",
24190+
"redirect_url": "/azure/storage/common/authorize-active-directory-powershell",
24191+
"redirect_document_id": true
24192+
},
2418824193
{
2418924194
"source_path": "articles/storage/storage-cannot-delete-storage-account-container-vhd.md",
2419024195
"redirect_url": "/azure/storage/storage-resource-manager-cannot-delete-storage-account-container-vhd",

‎articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ The certificate you request or create must meet the following requirements. Your
6161

6262
* **Trusted issuer** - The certificate must be issued by an authority trusted by computers connecting to the managed domain using secure LDAP. This authority may be a public CA or an Enterprise CA trusted by these computers.
6363
* **Lifetime** - The certificate must be valid for at least the next 3-6 months. Secure LDAP access to your managed domain is disrupted when the certificate expires.
64-
* **Subject name** - The subject name on the certificate must be your managed domain. For instance, if your domain is named *aadds.contoso.com*, the certificate's subject name must be **aadds.contoso.com*.
64+
* **Subject name** - The subject name on the certificate must be your managed domain. For instance, if your domain is named *aadds.contoso.com*, the certificate's subject name must be **.aadds.contoso.com*.
6565
* The DNS name or subject alternate name of the certificate must be a wildcard certificate to ensure the secure LDAP works properly with the Azure AD Domain Services. Domain Controllers use random names and can be removed or added to ensure the service remains available.
6666
* **Key usage** - The certificate must be configured for *digital signatures* and *key encipherment*.
6767
* **Certificate purpose** - The certificate must be valid for SSL server authentication.

‎articles/active-directory/authentication/quickstart-sspr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ ms.collection: M365-identity-device-management
2121
In this quickstart, you configure Azure Active Directory (AD) self-service password reset (SSPR) to enable users to reset their passwords or unlock their accounts. With SSPR, users can reset their own credentials without helpdesk or administrator assistance. This ability lets users regain access to their account without waiting for additional support.
2222

2323
> [!IMPORTANT]
24-
> This quickstart shows an administrator how to enable self-service password reset. If your IT team hasn't already enabled the ability to reset your own password, reach out to your helpdesk for additional assistance.
24+
> This quickstart shows an administrator how to enable self-service password reset. If you're an end user already registered for self-service password reset and need to get back into your account, go to https://aka.ms/sspr.
2525
>
26-
> If your IT team has enabled password reset, once you're [registered for self-service password reset][register-sspr] you can then [reset your work or school password][reset-password]. If you're not already registered for self-service password reset, reach out to your helpdesk for additional assistance.
26+
> If your IT team hasn't enabled the ability to reset your own password, reach out to your helpdesk for additional assistance.
2727
2828
## Prerequisites
2929

@@ -82,4 +82,4 @@ In this quickstart, you learned how to configure self-service password reset for
8282

8383
<!-- INTERNAL LINKS -->
8484
[register-sspr]: ../user-help/active-directory-passwords-reset-register.md
85-
[reset-password]: ../user-help/active-directory-passwords-update-your-own-password.md
85+
[reset-password]: ../user-help/active-directory-passwords-update-your-own-password.md

‎articles/active-directory/saas-apps/contractsafe-saml2-sso-tutorial.md

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
---
2+
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with ContractSafe Saml2 SSO | Microsoft Docs'
3+
description: Learn how to configure single sign-on between Azure Active Directory and ContractSafe Saml2 SSO.
4+
services: active-directory
5+
documentationCenter: na
6+
author: jeevansd
7+
manager: mtillman
8+
ms.reviewer: barbkess
9+
10+
ms.assetid: 9d8c9eba-6a90-4c8f-b387-a6ead4af00af
11+
ms.service: active-directory
12+
ms.subservice: saas-app-tutorial
13+
ms.workload: identity
14+
ms.tgt_pltfrm: na
15+
ms.topic: tutorial
16+
ms.date: 12/20/2019
17+
ms.author: jeedes
18+
19+
ms.collection: M365-identity-device-management
20+
---
21+
22+
# Tutorial: Azure Active Directory single sign-on (SSO) integration with ContractSafe Saml2 SSO
23+
24+
In this tutorial, you'll learn how to integrate ContractSafe Saml2 SSO with Azure Active Directory (Azure AD). When you integrate ContractSafe Saml2 SSO with Azure AD, you can:
25+
26+
* Control in Azure AD who has access to ContractSafe Saml2 SSO.
27+
* Enable your users to be automatically signed-in to ContractSafe Saml2 SSO with their Azure AD accounts.
28+
* Manage your accounts in one central location - the Azure portal.
29+
30+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis).
31+
32+
## Prerequisites
33+
34+
To get started, you need the following items:
35+
36+
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37+
* ContractSafe Saml2 SSO single sign-on (SSO) enabled subscription.
38+
39+
## Scenario description
40+
41+
In this tutorial, you configure and test Azure AD SSO in a test environment.
42+
43+
* ContractSafe Saml2 SSO supports **IDP** initiated SSO
44+
45+
## Adding ContractSafe Saml2 SSO from the gallery
46+
47+
To configure the integration of ContractSafe Saml2 SSO into Azure AD, you need to add ContractSafe Saml2 SSO from the gallery to your list of managed SaaS apps.
48+
49+
1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
50+
1. On the left navigation pane, select the **Azure Active Directory** service.
51+
1. Navigate to **Enterprise Applications** and then select **All Applications**.
52+
1. To add new application, select **New application**.
53+
1. In the **Add from the gallery** section, type **ContractSafe Saml2 SSO** in the search box.
54+
1. Select **ContractSafe Saml2 SSO** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
55+
56+
## Configure and test Azure AD single sign-on for ContractSafe Saml2 SSO
57+
58+
Configure and test Azure AD SSO with ContractSafe Saml2 SSO using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in ContractSafe Saml2 SSO.
59+
60+
To configure and test Azure AD SSO with ContractSafe Saml2 SSO, complete the following building blocks:
61+
62+
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
63+
* **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
64+
* **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
65+
1. **[Configure ContractSafe Saml2 SSO](#configure-contractsafe-saml2-sso)** - to configure the single sign-on settings on application side.
66+
* **[Create ContractSafe Saml2 SSO test user](#create-contractsafe-saml2-sso-test-user)** - to have a counterpart of B.Simon in ContractSafe Saml2 SSO that is linked to the Azure AD representation of user.
67+
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
68+
69+
## Configure Azure AD SSO
70+
71+
Follow these steps to enable Azure AD SSO in the Azure portal.
72+
73+
1. In the [Azure portal](https://portal.azure.com/), on the **ContractSafe Saml2 SSO** application integration page, find the **Manage** section and select **single sign-on**.
74+
1. On the **Select a single sign-on method** page, select **SAML**.
75+
1. On the **Set up single sign-on with SAML** page, click the edit/pen icon for **Basic SAML Configuration** to edit the settings.
76+
77+
![Edit Basic SAML Configuration](common/edit-urls.png)
78+
79+
1. On the **Set up single sign-on with SAML** page, enter the values for the following fields:
80+
81+
a. In the **Identifier** text box, type a URL using the following pattern:
82+
`https://app.contractsafe.com/saml2_auth/<UNIQUEID>/acs/`
83+
84+
b. In the **Reply URL** text box, type a URL using the following pattern:
85+
`https://app.contractsafe.com/saml2_auth/<UNIQUEID>/acs/`
86+
87+
> [!NOTE]
88+
> These values are not real. Update these values with the actual Identifier and Reply URL. Contact [ContractSafe Saml2 SSO Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
89+
90+
1. ContractSafe Saml2 SSO application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes.
91+
92+
![image](common/default-attributes.png)
93+
94+
1. In addition to above, ContractSafe Saml2 SSO application expects few more attributes to be passed back in SAML response which are shown below. These attributes are also pre populated but you can review them as per your requirements.
95+
96+
| Name | Source Attribute|
97+
| ---------------| --------------- |
98+
| emailname | user.userprincipalname |
99+
| email | user.onpremisesuserprincipalname |
100+
101+
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the certificate and save it on your computer.
102+
103+
![The Certificate download link](common/metadataxml.png)
104+
105+
1. On the **Set up ContractSafe Saml2 SSO** section, copy the appropriate URL(s) based on your requirement.
106+
107+
![Copy configuration URLs](common/copy-configuration-urls.png)
108+
109+
### Create an Azure AD test user
110+
111+
In this section, you'll create a test user in the Azure portal called B.Simon.
112+
113+
1. From the left pane in the Azure portal, select **Azure Active Directory**, select **Users**, and then select **All users**.
114+
1. Select **New user** at the top of the screen.
115+
1. In the **User** properties, follow these steps:
116+
1. In the **Name** field, enter `B.Simon`.
117+
1. In the **User name** field, enter the [email protected]. For example, `[email protected]`.
118+
1. Select the **Show password** check box, and then write down the value that's displayed in the **Password** box.
119+
1. Click **Create**.
120+
121+
### Assign the Azure AD test user
122+
123+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to ContractSafe Saml2 SSO.
124+
125+
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
126+
1. In the applications list, select **ContractSafe Saml2 SSO**.
127+
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
128+
129+
![The "Users and groups" link](common/users-groups-blade.png)
130+
131+
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
132+
133+
![The Add User link](common/add-assign-user.png)
134+
135+
1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
136+
1. If you're expecting any role value in the SAML assertion, in the **Select Role** dialog, select the appropriate role for the user from the list and then click the **Select** button at the bottom of the screen.
137+
1. In the **Add Assignment** dialog, click the **Assign** button.
138+
139+
## Configure ContractSafe Saml2 SSO
140+
141+
To configure single sign-on on **ContractSafe Saml2 SSO** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [ContractSafe Saml2 SSO support team](mailto:[email protected]). They set this setting to have the SAML SSO connection set properly on both sides.
142+
143+
### Create ContractSafe Saml2 SSO test user
144+
145+
In this section, you create a user called B.Simon in ContractSafe Saml2 SSO. Work with [ContractSafe Saml2 SSO support team](mailto:[email protected]) to add the users in the ContractSafe Saml2 SSO platform. Users must be created and activated before you use single sign-on.
146+
147+
## Test SSO
148+
149+
In this section, you test your Azure AD single sign-on configuration using the Access Panel.
150+
151+
When you click the ContractSafe Saml2 SSO tile in the Access Panel, you should be automatically signed in to the ContractSafe Saml2 SSO for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
152+
153+
## Additional resources
154+
155+
- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
156+
157+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
158+
159+
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
160+
161+
- [Try ContractSafe Saml2 SSO with Azure AD](https://aad.portal.azure.com/)

‎articles/active-directory/saas-apps/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@
337337
href: consent2go-tutorial.md
338338
- name: Contentful
339339
href: contentful-tutorial.md
340+
- name: ContractSafe Saml2 SSO
341+
href: contractsafe-saml2-sso-tutorial.md
340342
- name: ContractWorks
341343
href: contractworks-tutorial.md
342344
- name: Control

‎articles/app-service/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@
203203
href: app-service-web-app-cloning.md
204204
- name: Move resources
205205
href: ../azure-resource-manager/resource-group-move-resources.md?toc=%2fazure%2fapp-service%2ftoc.json#app-service-limitations
206+
- name: Restore deleted App Service
207+
href: app-service-undelete.md
206208
- name: Run background tasks
207209
items:
208210
- name: Create WebJobs

‎articles/azure-functions/functions-create-function-linux-custom-image.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ storageConnectionString=$(az storage account show-connection-string \
170170
171171
az functionapp config appsettings set --name <app_name> \
172172
--resource-group myResourceGroup \
173-
--settings AzureWebJobsDashboard=$storageConnectionString \
174-
AzureWebJobsStorage=$storageConnectionString
173+
--settings AzureWebJobsStorage=$storageConnectionString
175174
```
176175

177176
> [!NOTE]

‎articles/azure-monitor/insights/network-performance-monitor-service-connectivity.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Network Performance Monitor solution in Azure Log Analytics | Microsoft Docs
2+
title: Network Performance Monitor solution Service Connectivity - Azure Log Analytics
33
description: Use the Service Connectivity Monitor capability in Network Performance Monitor to monitor network connectivity to any endpoint that has an open TCP port.
44
ms.service: azure-monitor
55
ms.subservice: logs

‎articles/azure-netapp-files/azure-netapp-files-configure-export-policy.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
---
2-
title: Configure export policy for an NFS volume using Azure NetApp Files | Microsoft Docs
2+
title: Configure export policy for NFS volume - Azure NetApp Files
33
description: Describes how to configure export policy to control access to an NFS volume using Azure NetApp Files
44
services: azure-netapp-files
5-
documentationcenter: ''
65
author: b-juche
7-
manager: ''
8-
editor: ''
9-
10-
ms.assetid:
6+
ms.author: b-juche
117
ms.service: azure-netapp-files
128
ms.workload: storage
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
159
ms.topic: conceptual
1610
ms.date: 10/18/2019
17-
ms.author: b-juche
1811
---
1912
# Configure export policy for an NFS volume
2013

‎articles/azure-netapp-files/azure-netapp-files-mount-unmount-volumes-for-virtual-machines.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
---
2-
title: Mount or unmount an Azure NetApp Files volume for Windows or Linux virtual machines | Microsoft Docs
3-
description: Describes how to mount or unmount a volume for virtual machines or Linux virtual machines.
4-
services: azure-netapp-files
5-
documentationcenter: ''
2+
title: Mount Azure NetApp Files volumes for virtual machines
3+
description: Learn how to mount or unmount a volume for Windows virtual machines or Linux virtual machines in Azure.
64
author: b-juche
7-
manager: ''
8-
editor: ''
9-
10-
ms.assetid:
5+
ms.author: b-juche
116
ms.service: azure-netapp-files
127
ms.workload: storage
13-
ms.tgt_pltfrm: na
14-
ms.devlang: na
158
ms.topic: conceptual
169
ms.date: 12/05/2019
17-
ms.author: b-juche
1810
---
1911
# Mount or unmount a volume for Windows or Linux virtual machines
2012

0 commit comments

Comments
 (0)