From 6da43edf415c6ff9018b67339efab94fce01febd Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 15:13:54 -0700 Subject: [PATCH 01/11] replace old content with new --- .../how-to-move-the-mbam-25-databases.md | 751 ++++++++++-------- 1 file changed, 419 insertions(+), 332 deletions(-) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index ddeb99133d..bb48e14638 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -7,20 +7,26 @@ ms.pagetype: mdop, security ms.mktglfcycl: manage ms.sitesec: library ms.prod: w10 -ms.date: 06/16/2016 +ms.date: 05/23/2018 --- - # How to Move the MBAM 2.5 Databases - -Use these procedures to move the following databases from one computer to another, that is, to move the databases from Server A to Server B: +Use these procedures to move the following databases from one computer to +another; from Server A to Server B, for example: - Compliance and Audit Database - Recovery Database -If you are moving multiple features, move them in the following order: +>[!NOTE] +>It is important that the databases be restored to Machine B PRIOR to running the MBAM Configuration Wizard to update/configure them. + +If the databases are NOT present, the Configuration Wizard creates NEW, empty, databases. When your existing databases are then restored, this process will break the MBAM configuration. + +Restore the databases FIRST, then run the MBAM Configuration Wizard, choose the database option, and the Configuration Wizard will “connect” to the databases you restored; upgrading them if needed as part of the process. + +**If you are moving multiple features, move them in the following order:** 1. Recovery Database @@ -32,13 +38,10 @@ If you are moving multiple features, move them in the following order: 5. Self-Service Portal -**Note**   -To run the example Windows PowerShell scripts provided in this topic, you must update the Windows PowerShell execution policy to enable scripts to be run. See [Running Windows PowerShell Scripts](http://technet.microsoft.com/library/ee176949.aspx) for instructions. - -  - -## Moving the Recovery Database +>[!Note] +>To run the example Windows PowerShell scripts provided in this topic, you must update the Windows PowerShell execution policy to enable scripts to be run. See [Running Windows PowerShell Scripts](http://technet.microsoft.com/library/ee176949.aspx) for instructions. +## Move the Recovery Database The high-level steps for moving the Recovery Database are: @@ -46,473 +49,557 @@ The high-level steps for moving the Recovery Database are: 2. Back up the Recovery Database on Server A -3. Install MBAM Server software and run the MBAM Server Configuration wizard on Server B +3. Move the Recovery Database from Server A to Server B -4. Move the Recovery Database from Server A to Server B +4. Restore the Recovery Database on Server B -5. Restore the Recovery Database on Server B +5. Configure access to the Database on Server B and update connection data -6. Configure access to the Database on Server B and update connection data +6. Install MBAM Server software and run the MBAM Server Configuration wizard on Server B 7. Resume the instance of the Administration and Monitoring Website -**How to move the Recovery Database** +### How to move the Recovery Database -1. **Stop all instances of the MBAM Administration and Monitoring Website** +**Stop all instances of the MBAM Administration and Monitoring Website** - - On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. +1. On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. - To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: +2. To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: - ``` syntax - PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" - ``` +```syntax - **Note**   - To run this command, you must add the Internet Information Services (IIS) module for Windows PowerShell to the current instance of Windows PowerShell. +PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" -   +``` -2. **Install MBAM Server software and run the MBAM Server Configuration wizard on Server B** +>[!NOTE] +>To run this command, you must add the Internet Information Services (IIS) module for Windows PowerShell to the current instance of Windows PowerShell. - 1. Install the MBAM 2.5 Server software on Server B. For instructions, see [Installing the MBAM 2.5 Server Software](installing-the-mbam-25-server-software.md). +### Back up the Recovery Database on Server A - 2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Recovery Database** feature. +1. Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A.

By default, the database name is **MBAM Recovery Database**. - Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Recovery Database. +2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: - For instructions on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](how-to-configure-the-mbam-25-databases.md). + ```syntax -3. **Back up the Recovery Database on Server A** + USE master; - 1. Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A. By default, the database name is **MBAM Recovery Database**. + GO - To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: + ALTER DATABASE "MBAM Recovery and Hardware" - ``` syntax - USE master; - GO - ALTER DATABASE "MBAM Recovery and Hardware" - SET RECOVERY FULL; - GO - -- Create MBAM Recovery Database Data and MBAM Recovery logical backup devices. - USE master - GO - EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device', - 'Z:\MBAM Recovery Database Data.bak'; - GO - -- Back up the full MBAM Recovery Database. - BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device]; - GO - BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate] - TO FILE = 'Z:\SQLServerInstanceCertificateFile' - WITH PRIVATE KEY - ( - FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey', - ENCRYPTION BY PASSWORD = '$PASSWORD$' - ); - GO - ``` + SET RECOVERY FULL; - Use the following value to replace the values in the code example with values that match your environment. + GO - **$PASSWORD$** - password that you will use to encrypt the Private Key file. + -- Create MBAM Recovery Database Data and MBAM Recovery logical backup devices. - 2. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: + USE master - ``` syntax - PS C:\> Invoke-Sqlcmd -InputFile 'Z:\BackupMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ - ``` + GO - Use the following value to replace the values in the code example with values that match your environment: + EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device', - **$SERVERNAME$\\$SQLINSTANCENAME$** - server name and instance from which the Recovery Database will be backed up. + 'Z:\MBAM Recovery Database Data.bak'; -4. **Move the Recovery Database from Server A to Server B** + GO - - Use Windows Explorer to move the **MBAM Compliance Status Database Data.bak** file from Server A to Server B. + -- Back up the full MBAM Recovery Database. - To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device]; - ``` syntax - PS C:\> Copy-Item “Z:\MBAM Recovery Database Data.bak” \\$SERVERNAME$\$DESTINATIONSHARE$ - PS C:\> Copy-Item “Z:\SQLServerInstanceCertificateFile” \\$SERVERNAME$\$DESTINATIONSHARE$ - PS C:\> Copy-Item “Z:\SQLServerInstanceCertificateFilePrivateKey” \\$SERVERNAME$\$DESTINATIONSHARE$ - ``` + GO - Use the information in the following table to replace the values in the code example with values that match your environment. + BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate] - - - - - - - - - - - - - - - - - - - - - -
ParameterDescription

$SERVERNAME$

Name of the server to which the files will be copied.

$DESTINATIONSHARE$

Name of the share and path to which the files will be copied.

+ TO FILE = 'Z:\SQLServerInstanceCertificateFile' -   + WITH PRIVATE KEY -5. **Restore the Recovery Database on Server B** + ( - 1. Restore the Recovery Database on Server B by using the **Restore Database** task in SQL Server Management Studio. + FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey', - 2. When the previous task finishes, select **From Device**, and then select the database backup file. + ENCRYPTION BY PASSWORD = '$PASSWORD$' - 3. Use the **Add** command to select the **MBAM Recovery Database Data.bak** file, and click **OK** to complete the restoration process. + ); - To automate this procedure, create a SQL file (.sql) that contains the following SQL script: + GO + ``` +3. Use the following value to replace the values in the code example with values that match your environment: - ``` syntax - -- Restore MBAM Recovery Database. - USE master - GO - -- Drop certificate created by MBAM Setup. - DROP CERTIFICATE [MBAM Recovery Encryption Certificate] - GO - --Add certificate - CREATE CERTIFICATE [MBAM Recovery Encryption Certificate] - FROM FILE = 'Z: \SQLServerInstanceCertificateFile' - WITH PRIVATE KEY - ( - FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey', - DECRYPTION BY PASSWORD = '$PASSWORD$' - ); - GO - -- Restore the MBAM Recovery Database data and log files. - RESTORE DATABASE [MBAM Recovery and Hardware] - FROM DISK = 'Z:\MBAM Recovery Database Data.bak' - WITH REPLACE - ``` + **$PASSWORD$** - password that you use to encrypt the Private Key file. - Use the following value to replace the values in the code example with values that match your environment. +4. In Windows PowerShell, run the script that is stored in the file and similar to the following: - **$PASSWORD$** - password that you used to encrypt the Private Key file. + ```syntax - 4. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: + PS C:\> Invoke-Sqlcmd -InputFile + 'Z:\BackupMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ + ``` +5. Use the following value to replace the values in the code example with values that match your environment: - ``` syntax - PS C:\> Invoke-Sqlcmd -InputFile 'Z:\RestoreMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ - ``` + **$SERVERNAME$\$SQLINSTANCENAME$** - server name and instance from which the Recovery Database will be backed up. - Use the following value to replace the values in the code example with values that match your environment. +### Move the Recovery Database from Server A to Server B - **$SERVERNAME$\\$SQLINSTANCENAME$** - Server name and instance to which the Recovery Database will be restored. +Use Windows Explorer to move the **MBAM Compliance Status Database Data.bak** file from Server A to Server B. -6. **Configure access to the Database on Server B and update connection data** +To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: - 1. Verify that the Microsoft SQL Server user login that enables Recovery Database access on the restored database is mapped to the access account that you provided during the configuration process. +```syntax - If the login is not the same, create a login by using SQL Server Management Studio, and map it to the existing database user. +PS C:\> Copy-Item “Z:\MBAM Recovery Database Data.bak” +\\$SERVERNAME$\$DESTINATIONSHARE$ - 2. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to update the connection string information for the MBAM websites. +PS C:\> Copy-Item “Z:\SQLServerInstanceCertificateFile” +\\$SERVERNAME$\$DESTINATIONSHARE$ - 3. Edit the following registry key: **HKLM\\Software\\Microsoft\\MBAM Server\\Web\\RecoveryDBConnectionString** +PS C:\> Copy-Item “Z:\SQLServerInstanceCertificateFilePrivateKey” +\\$SERVERNAME$\$DESTINATIONSHARE$ - 4. Update the **Data Source** value with the name of the server and instance (for example, $SERVERNAME$\\$SQLINSTANCENAME) to which the Recovery Database was moved. +``` +Use the information in the following table to replace the values in the code example with values that match your environment. - 5. Update the **Initial Catalog** value with the recovered database name. - To automate this process, you can use the Windows PowerShell command prompt to enter a command line on the Administration and Monitoring Server that is similar to the following: +| **Parameter** | **Description** | +|----------------------|---------------------------------------------------------------| +| $SERVERNAME$ | Name of the server to which the files will be copied. | +| $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | - ``` syntax - PS C:\> reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MBAM Server\Web" /v RecoveryDBConnectionString /t REG_SZ /d "Integrated Security=SSPI;Initial Catalog=$DATABASE$;Data Source=$SERVERNAME$\$SQLINSTANCENAME$" /f - PS C:\> Set-WebConfigurationProperty '/connectionStrings/add[@name="KeyRecoveryConnectionString"]' -PSPath "IIS:\sites\Microsoft Bitlocker Administration and Monitoring\MBAMAdministrationService" -Name "connectionString" -Value “Data Source=$SERVERNAME$\$SQLINSTANCENAME$;Initial Catalog=MBAM Recovery and Hardware;Integrated Security=SSPI;” - PS C:\> Set-WebConfigurationProperty '/connectionStrings/add[@name="Microsoft.Mbam.RecoveryAndHardwareDataStore.ConnectionString"]' -PSPath "IIS:\sites\Microsoft Bitlocker Administration and Monitoring\MBAMRecoveryAndHardwareService" -Name "connectionString" -Value "Data Source=$SERVERNAME$\$SQLINSTANCENAME$;Initial Catalog=MBAM Recovery and Hardware;Integrated Security=SSPI;” - ``` +### Restore the Recovery Database on Server B - **Note**   - This connection string is shared by all local MBAM web applications. Therefore, it needs to be updated only once per server. +1. Restore the Recovery Database on Server B by using the **Restore Database** task in SQL Server Management Studio. -   +2. When the previous task finishes, select **From Device**, and then select the database backup file. - Use the following table to replace the values in the code example with values that match your environment. +3. Use the **Add** command to select the **MBAM Recovery Database Data.bak** file, and click **OK** to complete the restoration process. - - - - - - - - - - - - - - - - - - - - - -
ParameterDescription

$SERVERNAME$\$SQLINSTANCENAME$

Server name and instance of SQL Server where the Recovery Database is located.

$DATABASE$

Name of the Recovery database.

+4. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: -   + ```syntax -7. **Resume the instance of the Administration and Monitoring Website** + -- Restore MBAM Recovery Database. - 1. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to start the Administration and Monitoring Website. + USE master - 2. To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + GO - ``` syntax - PS C:\> Start-Website "Microsoft BitLocker Administration and Monitoring" - ``` + -- Drop certificate created by MBAM Setup. - **Note**   - To run this command, you must add the IIS module for Windows PowerShell to the current instance of Windows PowerShell. + DROP CERTIFICATE [MBAM Recovery Encryption Certificate] -   + GO -## Moving the Compliance and Audit Database + --Add certificate + CREATE CERTIFICATE [MBAM Recovery Encryption Certificate] + + FROM FILE = 'Z:\SQLServerInstanceCertificateFile' + + WITH PRIVATE KEY + + ( + + FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey', + + DECRYPTION BY PASSWORD = '$PASSWORD$' + + ); + + GO + + -- Restore the MBAM Recovery Database data and log files. + + RESTORE DATABASE [MBAM Recovery and Hardware] + + FROM DISK = 'Z:\MBAM Recovery Database Data.bak' + + WITH REPLACE + ``` + +5. Use the following value to replace the values in the code example with values that match your environment. + + **$PASSWORD$** - password that you used to encrypt the Private Key file. + +6. In Windows PowerShell, run the script that is stored in the file and similar to the following: + + ```syntax + + PS C:\> Invoke-Sqlcmd -InputFile 'Z:\RestoreMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ + ``` +7. Use the following value to replace the values in the code example with values that match your environment. + + **$SERVERNAME$\$SQLINSTANCENAME$** - Server name and instance to which the Recovery Database will be restored. + +### Configure access to the Database on Server B and update connection data + +1. Verify that the Microsoft SQL Server user login that enables Recovery Database access on the restored database is mapped to the access account that you provided during the configuration process. + + >[!NOTE] + >If the login is not the same, create a login by using SQL Server Management Studio, and map it to the existing database user. + +2. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to update the connection string information for the MBAM websites. + +3. Edit the following registry key: + + **HKLM\\Software\\Microsoft\\MBAM Server\\Web\\RecoveryDBConnectionString** + +4. Update the **Data Source** value with the name of the server and instance (for example, \$SERVERNAME\$\\\$SQLINSTANCENAME) to which the Recovery Database was moved. + +5. Update the **Initial Catalog** value with the recovered database name. + +6. To automate this process, you can use the Windows PowerShell command prompt to enter a command line on the Administration and Monitoring Server that is similar to the following: + + ```syntax + + PS C:\> reg add "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft\MBAM Server\\Web" /v + RecoveryDBConnectionString /t REG_SZ /d "Integrated Security=SSPI;Initial + Catalog=$DATABASE$;Data Source=$SERVERNAME$\$SQLINSTANCENAME$" /f + + PS C:\> Set-WebConfigurationProperty + 'connectionStrings/add[@name="KeyRecoveryConnectionString"]' -PSPath + "IIS:\sites\Microsoft Bitlocker Administration and + Monitoring\MBAMAdministrationService" -Name "connectionString" -Value “Data + Source=$SERVERNAME$\$SQLINSTANCENAME$;Initial Catalog=MBAM Recovery and + Hardware;Integrated Security=SSPI;” + + PS C:\> Set-WebConfigurationProperty + 'connectionStrings/add[\@name="Microsoft.Mbam.RecoveryAndHardwareDataStore.ConnectionString"]' + -PSPath "IIS:\sites\Microsoft Bitlocker Administration and + Monitoring\MBAMRecoveryAndHardwareService" -Name "connectionString" -Value + "Data Source=$SERVERNAME$\$SQLINSTANCENAME$;Initial Catalog=MBAM Recovery + and Hardware;Integrated Security=SSPI;” + ``` + + >[!Note] + >This connection string is shared by all local MBAM web applications. Therefore, it needs to be updated only once per server. + + +7. Use the following table to replace the values in the code example with values that match your environment. + + ```html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ParameterDescription

$SERVERNAME$\$SQLINSTANCENAME$

Server name and instance of SQL Server where the + Recovery Database is located.

$DATABASE$

Name of the Recovery database.

+ + ``` + +### Install MBAM Server software and run the MBAM Server Configuration wizard on Server B + +Install the MBAM 2.5 Server software on Server B. For more details, see [Installing the MBAM 2.5 Server Software](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/installing-the-mbam-25-server-software). + +1. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Recovery Database** feature. + + >[!TIP] + >Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Recovery Database. + +2. For instructions on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). + +### Resume the instance of the Administration and Monitoring Website + +On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to start the Administration and Monitoring Website. + +To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + +```syntax +PS C:\> Start-Website "Microsoft BitLocker Administration and Monitoring" +``` + +>[!NOTE] +>To run this command, you must add the IIS module for Windows PowerShell to the current instance of Windows PowerShell. + +## Move the Compliance and Audit Database The high-level steps for moving the Compliance and Audit Database are: 1. Stop all instances of the MBAM Administration and Monitoring Website -2. Install MBAM Server software and run the MBAM Server Configuration wizard on Server B +2. Back up the Compliance and Audit Database on Server A -3. Back up the Compliance and Audit Database on Server A +3. Move the Compliance and Audit Database from Server A to Server B -4. Move the Compliance and Audit Database from Server A to Server B +4. Restore the Compliance and Audit Database on Server B -5. Restore the Compliance and Audit Database on Server B +5. Configure access to the Database on Server B and update connection data -6. Configure access to the Database on Server B and update connection data +6. Install MBAM Server software and run the MBAM Server Configuration wizard on + Server B 7. Resume the instance of the Administration and Monitoring Website -**How to move the Compliance and Audit Database** +### How to move the Compliance and Audit Database -1. **Stop all instances of the MBAM Administration and Monitoring Website** +**Stop all instances of the MBAM Administration and Monitoring Website** - - On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. +On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. - To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: +To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: - ``` syntax - PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" - ``` +```syntax - **Note**   - To run this command, you must add the Internet Information Services (IIS) module for Windows PowerShell to the current instance of Windows PowerShell. +PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" -   +``` -2. **Install MBAM Server software and run the MBAM Server Configuration wizard on Server B** +>[!NOTE] +>To run this command, you must add the Internet Information Services (IIS) module for Windows PowerShell to the current instance of Windows PowerShell. - 1. Install the MBAM 2.5 Server software on Server B. For instructions, see [Installing the MBAM 2.5 Server Software](installing-the-mbam-25-server-software.md). +### Back up the Compliance and Audit Database on Server A - 2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Compliance and Audit Database** feature. +1. Use the **Back Up** task in SQL Server Management Studio to back up the Compliance and Audit Database on Server A. By default, the database name is **MBAM Compliance Status Database**. - Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Compliance and Audit Database. +2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: - For instructions on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](how-to-configure-the-mbam-25-databases.md). + ```syntax -3. **Back up the Compliance and Audit Database on Server A** + USE master; - 1. Use the **Back Up** task in SQL Server Management Studio to back up the Compliance and Audit Database on Server A. By default, the database name is **MBAM Compliance Status Database**. + GO - To automate this procedure, create a SQL file (.sql) that contains the following SQL script: + ALTER DATABASE "MBAM Compliance Status" - ``` syntax - USE master; - GO - ALTER DATABASE "MBAM Compliance Status" - SET RECOVERY FULL; - GO - -- Create MBAM Compliance Status Data logical backup devices. - USE master - GO - EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device', - 'Z: \MBAM Compliance Status Database Data.bak'; - GO - -- Back up the full MBAM Compliance Recovery database. - BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device]; - GO - ``` + SET RECOVERY FULL; - 2. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: + GO - ``` syntax - PS C:\> Invoke-Sqlcmd -InputFile "Z:\BackupMBAMComplianceStatusDatabaseScript.sql" –ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ - ``` + -- Create MBAM Compliance Status Data logical backup devices. - Using the following value, replace the values in the code example with values that match your environment: + USE master - **$SERVERNAME$\\$SQLINSTANCENAME$** - server name and instance from which the Compliance and Audit Database will be backed up. + GO -4. **Move the Compliance and Audit Database from Server A to Server B** + EXEC sp_addumpdevice 'disk', 'MBAM Compliance Status Database Data Device', - - Use Windows Explorer to move the **MBAM Compliance Status Database Data.bak** file from Server A to Server B. + 'Z: \MBAM Compliance Status Database Data.bak'; - To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + GO - ``` syntax - PS C:\> Copy-Item "Z:\MBAM Compliance Status Database Data.bak" \\$SERVERNAME$\$DESTINATIONSHARE$ - ``` + -- Back up the full MBAM Compliance Recovery database. - Using the following table, replace the values in the code example with values that match your environment. + BACKUP DATABASE [MBAM Compliance Status] TO [MBAM Compliance Status Database Data Device]; - - - - - - - - - - - - - - - - - - - - - -
ParameterDescription

$SERVERNAME$

Name of the server to which the files will be copied.

$DESTINATIONSHARE$

Name of the share and path to which the files will be copied.

+ GO -   + ``` -5. **Restore the Compliance and Audit Database on Server B** +3. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: - 1. Restore the Compliance and Audit Database on Server B by using the **Restore Database** task in SQL Server Management Studio. + ```syntax - 2. When the previous task finishes, select **From Device**, and then select the database backup file. + PS C:\> Invoke-Sqlcmd -InputFile "Z:\BackupMBAMComplianceStatusDatabaseScript.sql" –ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ - 3. Use the **Add** command to select the **MBAM Compliance Status Database Data.bak** file, and click **OK** to complete the restoration process. + ``` - To automate this procedure, create a SQL file (.sql) that contains the following SQL script: +4. Using the following value, replace the values in the code example with values that match your environment: - ``` syntax - -- Create MBAM Compliance Status Database Data logical backup devices. - Use master - GO - -- Restore the MBAM Compliance Status database data files. - RESTORE DATABASE [MBAM Compliance Status] - FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak' - WITH REPLACE - ``` + **$SERVERNAME$\$SQLINSTANCENAME$** - server name and instance from which the Compliance and Audit Database will be backed up. - 4. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: +### Move the Compliance and Audit Database from Server A to Server B** - ``` syntax - PS C:\> Invoke-Sqlcmd -InputFile "Z:\RestoreMBAMComplianceStatusDatabaseScript.sql" -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ - ``` +1. Use Windows Explorer to move the **MBAM Compliance Status Database Data.bak** file from Server A to Server B. - Using the following value, replace the values in the code example with values that match your environment. +2. To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: - **$SERVERNAME$\\$SQLINSTANCENAME$** - Server name and instance to which the Compliance and Audit Database will be restored. + ```syntax -6. **Configure access to the Database on Server B and update connection data** + PS C:\> Copy-Item "Z:\MBAM Compliance Status Database Data.bak" + \\$SERVERNAME$\$DESTINATIONSHARE$ - 1. Verify that the Microsoft SQL Server user login that enables Compliance and Audit Database access on the restored database is mapped to the access account that you provided during the configuration process. + ``` - If the login is not the same, create a login by using SQL Server Management Studio, and map it to the existing database user. +3. Using the following table, replace the values in the code example with values that match your environment. - 2. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to update the connection string information for the Website. + | **Parameter** | **Description** | + |----------------------|---------------------------------------------------------------| + | $SERVERNAME$ | Name of the server to which the files will be copied. | + | $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | - 3. Edit the following registry key: **HKLM\\Software\\Microsoft\\MBAM Server\\Web\\ComplianceDBConnectionString** +### Restore the Compliance and Audit Database on Server B - 4. Update the **Data Source** value with the name of the server and instance (for example, $SERVERNAME$\\$SQLINSTANCENAME) to which the Recovery Database was moved. +1. Restore the Compliance and Audit Database on Server B by using the **Restore Database** task in SQL Server Management Studio. - 5. Update the **Initial Catalog** value with the recovered database name. +2. When the previous task finishes, select **From Device**, and then select the database backup file. - To automate this process, you can use the Windows PowerShell command prompt to enter a command line on the Administration and Monitoring Server that is similar to the following: +3. Use the **Add** command to select the **MBAM Compliance Status Database Data.bak** file and click **OK** to complete the restoration process. - ``` syntax - PS C:\> reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MBAM Server\Web" /v ComplianceDBConnectionString /t REG_SZ /d "Integrated Security=SSPI;Initial Catalog=$DATABASE$;Data Source=$SERVERNAME$\$SQLINSTANCENAME$" /f - ``` +4. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: - **Note**   - This connection string is shared by all local MBAM web applications. Therefore, it needs to be updated only once per server. + ```syntax -   + -- Create MBAM Compliance Status Database Data logical backup devices. - Using the following table, replace the values in the code example with values that match your environment. + Use master - - - - - - - - - - - - - - - - - - - - - -
ParameterDescription

$SERVERNAME$\$SQLINSTANCENAME$

Server name and instance of SQL Server where the Recovery Database is located.

$DATABASE$

Name of the recovered database.

+ GO -   + -- Restore the MBAM Compliance Status database data files. -7. **Resume the instance of the Administration and Monitoring Website** + RESTORE DATABASE [MBAM Compliance Status] - 1. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to start the Administration and Monitoring Website. + FROM DISK = 'C:\test\MBAM Compliance Status Database Data.bak' - 2. To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + WITH REPLACE - ``` syntax - PS C:\> Start-Website "Microsoft BitLocker Administration and Monitoring" - ``` + ``` - **Note**   - To run this command, you must add the IIS module for Windows PowerShell to the current instance of Windows PowerShell. +5. In Windows PowerShell, run the script that is stored in the file and similar to the following: -   + ```syntax + PS C:\> Invoke-Sqlcmd -InputFile "Z:\RestoreMBAMComplianceStatusDatabaseScript.sql" -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ + ``` -## Related topics +6. Using the following value, replace the values in the code example with values that match your environment. + **$SERVERNAME$\$SQLINSTANCENAME$** - Server name and instance to which the Compliance and Audit Database will be restored. -[How to Configure the MBAM 2.5 Databases](how-to-configure-the-mbam-25-databases.md) +### Configure access to the Database on Server B and update connection data -[Configuring MBAM 2.5 Server Features by Using Windows PowerShell](configuring-mbam-25-server-features-by-using-windows-powershell.md) +1. Verify that the Microsoft SQL Server user login that enables Compliance and Audit Database access on the restored database is mapped to the access account that you provided during the configuration process. -[Moving MBAM 2.5 Features to Another Server](moving-mbam-25-features-to-another-server.md) + >[!NOTE] + >If the login is not the same, create a login by using SQL Server Management Studio, and map it to the existing database user. -  +2. On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to update the connection string information for the Website. -  -## Got a suggestion for MBAM? -- Add or vote on suggestions [here](http://mbam.uservoice.com/forums/268571-microsoft-bitlocker-administration-and-monitoring). -- For MBAM issues, use the [MBAM TechNet Forum](https://social.technet.microsoft.com/Forums/home?forum=mdopmbam). +3. Edit the following registry key: + **HKLM\\Software\\Microsoft\\MBAM Server\\Web\\ComplianceDBConnectionString** +4. Update the **Data Source** value with the name of the server and instance (for example, \$SERVERNAME\$\\\$SQLINSTANCENAME) to which the Recovery Database was moved. +5. Update the **Initial Catalog** value with the recovered database name. +6. To automate this process, you can use the Windows PowerShell command prompt to enter a command line on the Administration and Monitoring Server that is similar to the following: + + ```syntax + PS C:\> reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MBAM Server\Web" /v + ComplianceDBConnectionString /t REG_SZ /d "Integrated Security=SSPI;Initial + Catalog=$DATABASE$;Data Source=$SERVERNAME$\$SQLINSTANCENAME$" /f + + ``` + >[!NOTE] + >This connection string is shared by all local MBAM web applications. Therefore, it needs to be updated only once per server. + + +7. Using the following table, replace the values in the code example with values that match your environment. + + ```html + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ParameterDescription

$SERVERNAME$\$SQLINSTANCENAME$

Server name and instance of SQL Server where the Recovery Database is located.

$DATABASE$

Name of the recovered database.

+ + ``` + +### Install MBAM Server software and run the MBAM Server Configuration wizard on Server B + +1. Install the MBAM 2.5 Server software on Server B. For details, see [Installing the MBAM 2.5 Server Software](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/installing-the-mbam-25-server-software). + +2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Compliance and Audit Database** feature. + + >[!TIP] + >Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Compliance and Audit Database. + +For details on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). + + +### Resume the instance of the Administration and Monitoring Website + +On the server that is running the Administration and Monitoring Website, use the Internet Information Services (IIS) Manager console to start the Administration and Monitoring Website. + +To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: + +```syntax + +PS C:\> Start-Website "Microsoft BitLocker Administration and Monitoring" + +``` + +>[!NOTE] +>To run this command, you must add the IIS module for Windows PowerShell to the current instance of Windows PowerShell. From b0134af0219965b4bbaf1ff23b8e9f75ac9e23a3 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 15:39:48 -0700 Subject: [PATCH 02/11] formatting and consistencies --- [!NOTE] | 0 .../how-to-move-the-mbam-25-databases.md | 41 ++++--------------- 2 files changed, 9 insertions(+), 32 deletions(-) create mode 100644 [!NOTE] diff --git a/[!NOTE] b/[!NOTE] new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index bb48e14638..6b80356e34 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -61,14 +61,11 @@ The high-level steps for moving the Recovery Database are: ### How to move the Recovery Database -**Stop all instances of the MBAM Administration and Monitoring Website** +**Stop all instances of the MBAM Administration and Monitoring Website.** On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. -1. On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. - -2. To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: +To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: ```syntax - PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" ``` @@ -78,9 +75,9 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" ### Back up the Recovery Database on Server A -1. Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A.

By default, the database name is **MBAM Recovery Database**. +Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A. By default, the database name is **MBAM Recovery Database**. -2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: +To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: ```syntax @@ -135,7 +132,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 4. In Windows PowerShell, run the script that is stored in the file and similar to the following: ```syntax - PS C:\> Invoke-Sqlcmd -InputFile 'Z:\BackupMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ ``` @@ -150,7 +146,6 @@ Use Windows Explorer to move the **MBAM Compliance Status Database Data.bak** fi To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: ```syntax - PS C:\> Copy-Item “Z:\MBAM Recovery Database Data.bak” \\$SERVERNAME$\$DESTINATIONSHARE$ @@ -163,7 +158,6 @@ PS C:\> Copy-Item “Z:\SQLServerInstanceCertificateFilePrivateKey” ``` Use the information in the following table to replace the values in the code example with values that match your environment. - | **Parameter** | **Description** | |----------------------|---------------------------------------------------------------| | $SERVERNAME$ | Name of the server to which the files will be copied. | @@ -180,7 +174,6 @@ Use the information in the following table to replace the values in the code exa 4. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: ```syntax - -- Restore MBAM Recovery Database. USE master @@ -227,7 +220,6 @@ Use the information in the following table to replace the values in the code exa 6. In Windows PowerShell, run the script that is stored in the file and similar to the following: ```syntax - PS C:\> Invoke-Sqlcmd -InputFile 'Z:\RestoreMBAMRecoveryandHardwarDatabaseScript.sql' -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ ``` 7. Use the following value to replace the values in the code example with values that match your environment. @@ -254,7 +246,6 @@ Use the information in the following table to replace the values in the code exa 6. To automate this process, you can use the Windows PowerShell command prompt to enter a command line on the Administration and Monitoring Server that is similar to the following: ```syntax - PS C:\> reg add "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft\MBAM Server\\Web" /v RecoveryDBConnectionString /t REG_SZ /d "Integrated Security=SSPI;Initial Catalog=$DATABASE$;Data Source=$SERVERNAME$\$SQLINSTANCENAME$" /f @@ -309,8 +300,7 @@ Use the information in the following table to replace the values in the code exa

$SERVERNAME$\$SQLINSTANCENAME$

-

Server name and instance of SQL Server where the - Recovery Database is located.

+

Server name and instance of SQL Server where the Recovery Database is located.

@@ -330,14 +320,13 @@ Use the information in the following table to replace the values in the code exa ### Install MBAM Server software and run the MBAM Server Configuration wizard on Server B -Install the MBAM 2.5 Server software on Server B. For more details, see [Installing the MBAM 2.5 Server Software](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/installing-the-mbam-25-server-software). +1. Install the MBAM 2.5 Server software on Server B. For details, see [Installing the MBAM 2.5 Server Software](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/installing-the-mbam-25-server-software). -1. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Recovery Database** feature. +2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Recovery Database** feature. For details on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). >[!TIP] >Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Recovery Database. -2. For instructions on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). ### Resume the instance of the Administration and Monitoring Website @@ -373,14 +362,11 @@ The high-level steps for moving the Compliance and Audit Database are: ### How to move the Compliance and Audit Database -**Stop all instances of the MBAM Administration and Monitoring Website** - -On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. +**Stop all instances of the MBAM Administration and Monitoring Website.** On each server that is running the MBAM Administration and Monitoring Server Website, use the Internet Information Services (IIS) Manager console to stop the Administration and Monitoring Website. To automate this procedure, you can use Windows PowerShell to enter a command that is similar to the following: ```syntax - PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" ``` @@ -395,7 +381,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: ```syntax - USE master; GO @@ -429,7 +414,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 3. Run the script that is stored in the .sql file by using a Windows PowerShell command that is similar to the following: ```syntax - PS C:\> Invoke-Sqlcmd -InputFile "Z:\BackupMBAMComplianceStatusDatabaseScript.sql" –ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ ``` @@ -445,7 +429,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 2. To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: ```syntax - PS C:\> Copy-Item "Z:\MBAM Compliance Status Database Data.bak" \\$SERVERNAME$\$DESTINATIONSHARE$ @@ -469,7 +452,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 4. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: ```syntax - -- Create MBAM Compliance Status Database Data logical backup devices. Use master @@ -489,7 +471,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 5. In Windows PowerShell, run the script that is stored in the file and similar to the following: ```syntax - PS C:\> Invoke-Sqlcmd -InputFile "Z:\RestoreMBAMComplianceStatusDatabaseScript.sql" -ServerInstance $SERVERNAME$\$SQLINSTANCENAME$ ``` @@ -530,7 +511,6 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 7. Using the following table, replace the values in the code example with values that match your environment. ```html - @@ -581,13 +561,11 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 1. Install the MBAM 2.5 Server software on Server B. For details, see [Installing the MBAM 2.5 Server Software](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/installing-the-mbam-25-server-software). -2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Compliance and Audit Database** feature. +2. On Server B, start the MBAM Server Configuration wizard, click **Add New Features**, and then select only the **Compliance and Audit Database** feature. For details on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). >[!TIP] >Alternatively, you can use the **Enable-MbamDatabase** Windows PowerShell cmdlet to configure the Compliance and Audit Database. -For details on how to configure the databases, see [How to Configure the MBAM 2.5 Databases](https://docs.microsoft.com/en-us/microsoft-desktop-optimization-pack/mbam-v25/how-to-configure-the-mbam-25-databases). - ### Resume the instance of the Administration and Monitoring Website @@ -596,7 +574,6 @@ On the server that is running the Administration and Monitoring Website, use the To automate this procedure, you can use Windows PowerShell to run a command that is similar to the following: ```syntax - PS C:\> Start-Website "Microsoft BitLocker Administration and Monitoring" ``` From 1217a11a27dffa71f332e479b38195bf04200b85 Mon Sep 17 00:00:00 2001 From: Allison Hopper - Microsoft Date: Tue, 22 May 2018 15:49:05 -0700 Subject: [PATCH 03/11] Mobile users cannot call HoloLens using Teams --- devices/hololens/hololens-microsoft-remote-assist-app.md | 5 ++--- devices/hololens/index.md | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/devices/hololens/hololens-microsoft-remote-assist-app.md b/devices/hololens/hololens-microsoft-remote-assist-app.md index c0338f0e8d..cea23cde18 100644 --- a/devices/hololens/hololens-microsoft-remote-assist-app.md +++ b/devices/hololens/hololens-microsoft-remote-assist-app.md @@ -9,7 +9,7 @@ author: alhopper-msft ms.author: alhopper ms.topic: article ms.localizationpriority: medium -ms.date: 05/21/2018 +ms.date: 05/22/2018 --- # Microsoft Remote Assist @@ -25,7 +25,6 @@ Below are the technical requirements to deploy and use Microsoft Remote Assist t |:---------------------------|:----------------------------------|:-----------------------------------------------------------| | HoloLens | Build 10.0.14393.0 or above | See [Manage updates to HoloLens](https://docs.microsoft.com/en-us/HoloLens/hololens-updates) for instructions on using Windows Update for Business, MDM, and Windows Server Update Service (WSUS) to deploy updates to HoloLens. | | Windows 10 PC (optional) | Any Windows 10 build | A Windows 10 PC can collaborate with the HoloLens using Microsoft Teams. | -| Mobile device (optional) | Android or iOS | A mobile device can collaborate with the HoloLens using Microsoft Teams. Inking, annotations, and image insertion are not currently available on mobile. | > [!Note] > HoloLens build 10.0.14393.0 is the minimum that supports Remote Assist. We recommend updating the HoloLens to newer versions when they are available. @@ -42,7 +41,7 @@ Below are the technical requirements to deploy and use Microsoft Remote Assist t 1.5 MB/s is the recommended bandwidth for optimal performance of Microsoft Remote Assist. Though audio/video calls may be possible in environments with reduced bandwidth, you may experience HoloLens feature degradation, limiting the user experience. To test your company’s network bandwidth, follow these steps: - 1. Have a mobile Teams user (iOS or Android) video call a desktop Teams user. + 1. Have a Teams user video call another Teams user. 2. Add another separate video call between a 3rd and 4th user, and another for a 5th and 6th user. 3. Continue adding video callers to stress test your network bandwidth until confident that multiple users can successfully connect on video calls at the same time. diff --git a/devices/hololens/index.md b/devices/hololens/index.md index 1cc40ecf7a..3ec29c73a2 100644 --- a/devices/hololens/index.md +++ b/devices/hololens/index.md @@ -9,7 +9,7 @@ author: jdeckerms ms.author: jdecker ms.topic: article ms.localizationpriority: medium -ms.date: 05/22/2018 +ms.date: 05/21/2018 --- # Microsoft HoloLens From 02309b79557c30b8c95132f18d91b55175134638 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 16:01:02 -0700 Subject: [PATCH 04/11] formatting of a code block --- mdop/mbam-v25/how-to-move-the-mbam-25-databases.md | 1 + 1 file changed, 1 insertion(+) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index 6b80356e34..2458b04eb0 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -381,6 +381,7 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script: ```syntax + USE master; GO From fd7b5be1aa244281841cd9cc2b02bfdad36c34b0 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 16:05:10 -0700 Subject: [PATCH 05/11] formatting of a code block --- mdop/mbam-v25/how-to-move-the-mbam-25-databases.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index 2458b04eb0..c77aebdae4 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -12,8 +12,7 @@ ms.date: 05/23/2018 # How to Move the MBAM 2.5 Databases -Use these procedures to move the following databases from one computer to -another; from Server A to Server B, for example: +Use these procedures to move the following databases from one computer to another; from Server A to Server B, for example: - Compliance and Audit Database @@ -162,6 +161,7 @@ Use the information in the following table to replace the values in the code exa |----------------------|---------------------------------------------------------------| | $SERVERNAME$ | Name of the server to which the files will be copied. | | $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | +--- ### Restore the Recovery Database on Server B @@ -441,6 +441,7 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" |----------------------|---------------------------------------------------------------| | $SERVERNAME$ | Name of the server to which the files will be copied. | | $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | + --- ### Restore the Compliance and Audit Database on Server B From 3a20f9a8b5a7f0903dcdab7250a8304191b319cf Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 16:08:38 -0700 Subject: [PATCH 06/11] formatting of a code block --- mdop/mbam-v25/how-to-move-the-mbam-25-databases.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index c77aebdae4..a75ee7c6f2 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -74,9 +74,9 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" ### Back up the Recovery Database on Server A -Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A. By default, the database name is **MBAM Recovery Database**. +1. Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A. By default, the database name is **MBAM Recovery Database**. -To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: +2 To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: ```syntax @@ -123,7 +123,9 @@ To automate this procedure, create a SQL file (.sql) that contains the following ); GO + ``` + 3. Use the following value to replace the values in the code example with values that match your environment: **$PASSWORD$** - password that you use to encrypt the Private Key file. From 3eefb473e3d55a744d1cd824c8f926b9df9affbd Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 16:11:59 -0700 Subject: [PATCH 07/11] formatting of a code block --- .../how-to-move-the-mbam-25-databases.md | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index a75ee7c6f2..85a1fe90ae 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -76,54 +76,52 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" 1. Use the **Back Up** task in SQL Server Management Studio to back up the Recovery Database on Server A. By default, the database name is **MBAM Recovery Database**. -2 To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: - - ```syntax +2. To automate this procedure, create a SQL file (.sql) that contains the following SQL script, and change the MBAM Recovery Database to use the full recovery mode: + ``` USE master; - + GO - + ALTER DATABASE "MBAM Recovery and Hardware" - + SET RECOVERY FULL; - + GO - + -- Create MBAM Recovery Database Data and MBAM Recovery logical backup devices. - + USE master - + GO - + EXEC sp_addumpdevice 'disk', 'MBAM Recovery and Hardware Database Data Device', - + 'Z:\MBAM Recovery Database Data.bak'; - + GO - + -- Back up the full MBAM Recovery Database. - + BACKUP DATABASE [MBAM Recovery and Hardware] TO [MBAM Recovery and Hardware Database Data Device]; - + GO - + BACKUP CERTIFICATE [MBAM Recovery Encryption Certificate] - + TO FILE = 'Z:\SQLServerInstanceCertificateFile' - + WITH PRIVATE KEY - + ( - + FILE = ' Z:\SQLServerInstanceCertificateFilePrivateKey', - + ENCRYPTION BY PASSWORD = '$PASSWORD$' - + ); - + GO - ``` 3. Use the following value to replace the values in the code example with values that match your environment: From fa0cb01205fbc8838d64af5a5972d47170a00b74 Mon Sep 17 00:00:00 2001 From: Patti Short Date: Tue, 22 May 2018 16:23:50 -0700 Subject: [PATCH 08/11] formatting of a code block --- mdop/mbam-v25/how-to-move-the-mbam-25-databases.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md index 85a1fe90ae..c8ba024eef 100644 --- a/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md +++ b/mdop/mbam-v25/how-to-move-the-mbam-25-databases.md @@ -161,7 +161,7 @@ Use the information in the following table to replace the values in the code exa |----------------------|---------------------------------------------------------------| | $SERVERNAME$ | Name of the server to which the files will be copied. | | $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | ---- +|---|---| ### Restore the Recovery Database on Server B @@ -441,7 +441,7 @@ PS C:\> Stop-Website "Microsoft BitLocker Administration and Monitoring" |----------------------|---------------------------------------------------------------| | $SERVERNAME$ | Name of the server to which the files will be copied. | | $DESTINATIONSHARE$ | Name of the share and path to which the files will be copied. | - --- + |---|---| ### Restore the Compliance and Audit Database on Server B From d13c4e8b7ddf70d85b84521742bc3379f3e82925 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 22 May 2018 23:33:10 +0000 Subject: [PATCH 09/11] Merged PR 8463: Added key info Added key info --- windows/deployment/deploy-enterprise-licenses.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/windows/deployment/deploy-enterprise-licenses.md b/windows/deployment/deploy-enterprise-licenses.md index 1f0b464194..f171f598a0 100644 --- a/windows/deployment/deploy-enterprise-licenses.md +++ b/windows/deployment/deploy-enterprise-licenses.md @@ -20,6 +20,16 @@ This topic describes how to deploy Windows 10 Enterprise E3 or E5 licenses with >Windows 10 Enterprise E3 in CSP requires Windows 10 Pro, version 1607 or later.
>Automatic, non-KMS activation requires Windows 10, version 1803 or later on a device with a firmware-embedded activation key.
+## Firware-embedded activation key + +To determine if the computer has a firmware-embedded activation key, type the following command at an elevated Windows PowerShell prompt + +``` +(Get-WmiObject -query ‘select * from SoftwareLicensingService’).OA3xOriginalProductKey +``` + +If the device has a firmware-embedded activation key, it will be displayed in the output. If the output is blank, the device does not have a firmware embedded activation key. Most OEM-provided devices designed to run Windows 8 or later will have a firmware-embedded key. + ## Enabling Subscription Activation with an existing EA If you are an EA customer with an existing Office 365 tenant, use the following steps to enable Windows 10 Subscription licenses on your existing tenant: From 233dab43b11af393bf310282f730e7d54bb9a794 Mon Sep 17 00:00:00 2001 From: MikeBlodge Date: Wed, 23 May 2018 08:00:18 -0700 Subject: [PATCH 10/11] edited metadata and corrected dialog box callouts. --- education/windows/s-mode-switch-to-edu.md | 6 ++---- windows/deployment/windows-10-pro-in-s-mode.md | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/education/windows/s-mode-switch-to-edu.md b/education/windows/s-mode-switch-to-edu.md index 9e17d2476b..73aa07a2c3 100644 --- a/education/windows/s-mode-switch-to-edu.md +++ b/education/windows/s-mode-switch-to-edu.md @@ -1,7 +1,7 @@ --- title: Switch to Windows 10 Pro Education in S mode from Windows 10 Pro in S mode description: Overview of Windows 10 Pro Education in S mode, switching options, and system requirements -keywords: Windows 10 Pro Education in S mode, S mode, system requirements, Overview, Windows 10 Pro in S mode, Education, EDU +keywords: S mode Switch, switch in S mode, Switch S mode, Windows 10 Pro Education in S mode, S mode, system requirements, Overview, Windows 10 Pro in S mode, Education, EDU ms.mktglfcycl: deploy ms.localizationpriority: high ms.prod: w10 @@ -53,9 +53,7 @@ Tenant-wide Windows 10 Pro in S mode > Pro Education in S mode
Tenant-wide Windows 10 Pro > Pro Education > [!IMPORTANT] -> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a BMR factory reset.. - -[Recovery media (bare metal recovery)](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/create-media-to-run-push-button-reset-features-s14) helps restore a Windows device to the factory state, even if the user needs to replace the hard drive or completely wipe the drive clean. If a device is switched out of S mode via the Microsoft Store, it will remain out of S mode even after the device is reset. +> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a [bare metal recover (BMR)](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/create-media-to-run-push-button-reset-features-s14) reset. This restores a Windows device to the factory state, even if the user needs to replace the hard drive or completely wipe the drive clean. If a device is switched out of S mode via the Microsoft Store, it will remain out of S mode even after the device is reset. ### Devices running Windows 10, version 1709 diff --git a/windows/deployment/windows-10-pro-in-s-mode.md b/windows/deployment/windows-10-pro-in-s-mode.md index 65d8ce2bec..c28bb0c1bd 100644 --- a/windows/deployment/windows-10-pro-in-s-mode.md +++ b/windows/deployment/windows-10-pro-in-s-mode.md @@ -1,7 +1,7 @@ --- title: Windows 10 Pro in S mode description: Overview of Windows 10 Pro in S mode, switching options, and system requirements -keywords: Windows 10 S, S-mode, system requirements, Overview, Windows 10 Pro in S mode, Windows 10 Pro in S mode +keywords: S mode Switch, Switch in S mode, s mode switch, Windows 10 S, S-mode, system requirements, Overview, Windows 10 Pro in S mode, Windows 10 Pro in S mode ms.mktglfcycl: deploy ms.localizationpriority: high ms.prod: w10 @@ -43,9 +43,7 @@ Worried about your LOB apps not working in S mode? Using Desktop Bridge will ena [Explore Desktop Bridge](https://docs.microsoft.com/en-us/windows/uwp/porting/desktop-to-uwp-root) > [!IMPORTANT] -> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a BMR factory reset.. - -[Recovery media (bare metal recovery)](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/create-media-to-run-push-button-reset-features-s14) helps restore a Windows device to the factory state, even if the user needs to replace the hard drive or completely wipe the drive clean. If a device is switched out of S mode via the Microsoft Store, it will remain out of S mode even after the device is reset. +> While it’s free to switch to Windows 10 Pro, it’s not reversible. The only way to rollback this kind of switch is through a [bare metal recover (BMR)](https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/create-media-to-run-push-button-reset-features-s14) reset. This restores a Windows device to the factory state, even if the user needs to replace the hard drive or completely wipe the drive clean. If a device is switched out of S mode via the Microsoft Store, it will remain out of S mode even after the device is reset. ### Windows 10 in S mode is safe, secure, and fast. We recommend staying in S mode. However, in some limited scenarios, you might need to switch to Windows 10 Pro. You can switch devices running Windows 10, version 1709 or later. Use the following information to switch to Windows 10 Pro through the Microsoft Store. From 1632ba99c8f37472bbd203519c29df5a6426a9e2 Mon Sep 17 00:00:00 2001 From: Sarah Vilaysom Date: Wed, 23 May 2018 17:07:21 +0000 Subject: [PATCH 11/11] Merged PR 8417: update MS Education hub page for task 1265931 --- education/index.md | 198 ++++----------------------------------------- 1 file changed, 14 insertions(+), 184 deletions(-) diff --git a/education/index.md b/education/index.md index 4a5f5a36ba..65f2638499 100644 --- a/education/index.md +++ b/education/index.md @@ -18,7 +18,7 @@ ms.date: 10/30/2017
- +
@@ -30,35 +30,17 @@ ms.date: 10/30/2017
  • - +
    - +
    - For IT Pros: Get Started using Microsoft Education -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    - Test Windows 10 S for Education + Deploy Microsoft 365 Education
    @@ -82,18 +64,18 @@ ms.date: 10/30/2017
  • - +
    - +
    -

    Microsoft 365 Education

    -

    Find out how to empower educators to unlock creativity, promote teamwork, and provide a simple and safe experience in a single, affordable solution built for education.

    +

    Cloud deployment

    +

    Get started by creating your Office 365 tenant, setting up a cloud infrastructure for your school, and creating, managing, and syncing user accounts.

    @@ -101,159 +83,7 @@ ms.date: 10/30/2017
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Get started for IT Pros

    -

    Get started with Microsoft Education and set up a cloud infrastructure for your school, acquire apps, and configure and deploy settings to your Windows 10 devices.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Office 365 for Education

    -

    Manage Office 365 users and groups, get reports, and more.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Microsoft Intune for Education

    -

    Manage apps and settings on your Windows 10 devices.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Windows 10 for Education

    -

    Configure and deploy the most secure Windows version for your school.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    School Data Sync

    -

    Import Student Information System (SIS) into Office 365.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Azure Active Directory

    -

    Use to create and manage user and group accounts.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Microsoft Store for Education

    -

    Purchase and manage apps and licenses for your school.

    -
    -
    -
    -
    -     -
    • -
  • - -
    -
    -
    -
    -
    - -
    -
    -
    -

    Minecraft: Education Edition

    -

    Learn how to get, distribute, and manage permissions for Minecraft: Education Edition.

    -
    -
    -
    -
    -     -
    • -
  • - +
    @@ -263,8 +93,8 @@ ms.date: 10/30/2017
    -

    Set up School PCs

    -

    Use the app to create a provisioning package that you can use to quickly set up one or more Windows 10 devices.

    +

    Device Management

    +

    Improve student learning outcomes through connected classrooms and engaging new technologies with streamlined device management.

    • @@ -272,7 +102,7 @@ ms.date: 10/30/2017
  • - +
    @@ -282,8 +112,8 @@ ms.date: 10/30/2017
    -

    Microsoft Teams

    -

    Make the most of Microsoft Teams and find out how to deploy, launch pilot teams, and launch Teams to the rest of your organization.

    +

    Tools for Teachers

    +

    The latest classroom resources at teachers’ fingertips when you deploy Learning Tools, OneNote Class Notebooks, Teams, and more.