Skip to content

Commit 9cc874f

Browse files
author
ajburnle
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into aj-fundamentals-au-data-storage
2 parents 9f87148 + 5fbb258 commit 9cc874f

File tree

7 files changed

+51
-27
lines changed

7 files changed

+51
-27
lines changed

‎articles/app-service/app-service-web-get-started-html.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In the following example, replace <app_name> with a unique app name.
4646
```bash
4747
cd html-docs-hello-world
4848

49-
az webapp up --location westeurope --name <app_name>
49+
az webapp up --location westeurope --name <app_name> --html
5050
```
5151

5252
The `az webapp up` command does the following actions:
@@ -98,7 +98,7 @@ Save your changes and exit nano. Use the command `^O` to save and `^X` to exit.
9898
You'll now redeploy the app with the same `az webapp up` command.
9999

100100
```bash
101-
az webapp up --location westeurope --name <app_name>
101+
az webapp up --location westeurope --name <app_name> --html
102102
```
103103

104104
Once deployment has completed, switch back to the browser window that opened in the **Browse to the app** step, and refresh the page.

‎articles/app-service/containers/configure-language-java.md

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,23 +234,37 @@ To inject these secrets in your Spring or Tomcat configuration file, use environ
234234
235235
### Using the Java Key Store
236236
237-
By default, any public or private certificates [uploaded to App Service Linux](../configure-ssl-certificate.md) will be loaded into the Java Key Store as the container starts. This means your uploaded certificates will be available in the connection context when making outbound TLS connections. After uploading your certificate, you will need to restart your App Service for it to be loaded into the Java Key Store.
237+
By default, any public or private certificates [uploaded to App Service Linux](../configure-ssl-certificate.md) will be loaded into the respective Java Key Stores as the container starts. After uploading your certificate, you will need to restart your App Service for it to be loaded into the Java Key Store. Public certificates are loaded into the Key Store at `$JAVA_HOME/jre/lib/security/cacerts`, and private certificates are stored in `$JAVA_HOME/lib/security/client.jks`.
238238
239-
You can interact or debug the Java Key Tool by [opening an SSH connection](app-service-linux-ssh-support.md) to your App Service and running the command `keytool`. See the [Key Tool documentation](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) for a list of commands. The certificates are stored in Java's default keystore file location, `$JAVA_HOME/jre/lib/security/cacerts`.
240-
241-
Additional configuration may be necessary for encrypting your JDBC connection. Please refer to the documentation for your chosen JDBC driver.
239+
Additional configuration may be necessary for encrypting your JDBC connection with certificates in the Java Key Store. Please refer to the documentation for your chosen JDBC driver.
242240
243241
- [PostgreSQL](https://jdbc.postgresql.org/documentation/head/ssl-client.html)
244242
- [SQL Server](https://docs.microsoft.com/sql/connect/jdbc/connecting-with-ssl-encryption?view=sql-server-ver15)
245243
- [MySQL](https://dev.mysql.com/doc/connector-j/5.1/en/connector-j-reference-using-ssl.html)
246244
- [MongoDB](https://mongodb.github.io/mongo-java-driver/3.4/driver/tutorials/ssl/)
247245
- [Cassandra](https://docs.datastax.com/en/developer/java-driver/4.3/)
248246
249-
#### Manually initialize and load the key store
247+
#### Initializing the Java Key Store
248+
249+
To initialize the `import java.security.KeyStore` object, load the keystore file with the password. The default password for both key stores is "changeit".
250+
251+
```java
252+
KeyStore keyStore = KeyStore.getInstance("jks");
253+
keyStore.load(
254+
new FileInputStream(System.getenv("JAVA_HOME")+"/lib/security/cacets"),
255+
"changeit".toCharArray());
256+
257+
KeyStore keyStore = KeyStore.getInstance("pkcs12");
258+
keyStore.load(
259+
new FileInputStream(System.getenv("JAVA_HOME")+"/lib/security/client.jks"),
260+
"changeit".toCharArray());
261+
```
262+
263+
#### Manually load the key store
250264
251-
You can initialize the key store and add certificates manually. Create an app setting, `SKIP_JAVA_KEYSTORE_LOAD`, with a value of `1` to disable App Service from loading the certificates into the key store automatically. All public certificates uploaded to App Service via the Azure portal are stored under `/var/ssl/certs/`. Private certificates are stored under `/var/ssl/private/`.
265+
You can load certificates manually to the key store. Create an app setting, `SKIP_JAVA_KEYSTORE_LOAD`, with a value of `1` to disable App Service from loading the certificates into the key store automatically. All public certificates uploaded to App Service via the Azure portal are stored under `/var/ssl/certs/`. Private certificates are stored under `/var/ssl/private/`.
252266
253-
For more information on the KeyStore API, please refer to [the official documentation](https://docs.oracle.com/javase/8/docs/api/java/security/KeyStore.html).
267+
You can interact or debug the Java Key Tool by [opening an SSH connection](app-service-linux-ssh-support.md) to your App Service and running the command `keytool`. See the [Key Tool documentation](https://docs.oracle.com/javase/8/docs/technotes/tools/unix/keytool.html) for a list of commands. For more information on the KeyStore API, please refer to [the official documentation](https://docs.oracle.com/javase/8/docs/api/java/security/KeyStore.html).
254268
255269
## Configure APM platforms
256270
@@ -368,7 +382,7 @@ Your startup script will make an [xsl transform](https://www.w3schools.com/xml/x
368382
apk add --update libxslt
369383
370384
# Usage: xsltproc --output output.xml style.xsl input.xml
371-
xsltproc --output /usr/local/tomcat/conf/server.xml /home/tomcat/conf/transform.xsl /home/tomcat/conf/server.xml
385+
xsltproc --output /home/tomcat/conf/server.xml /home/tomcat/conf/transform.xsl /usr/local/tomcat/conf/server.xml
372386
```
373387
374388
An example xsl file is provided below. The example xsl file adds a new connector node to the Tomcat server.xml.

‎articles/sql-data-warehouse/sql-data-warehouse-install-visual-studio.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: craigg
99
ms.service: sql-data-warehouse
1010
ms.topic: conceptual
1111
ms.subservice: development
12-
ms.date: 11/06/2019
12+
ms.date: 01/07/2020
1313
ms.author: kevin
1414
ms.reviewer: igorstan
1515
ms.custom: seo-lt-2019
@@ -41,6 +41,7 @@ There are times when feature releases for SQL Data Warehouse may not include sup
4141
- [Dynamic data masking](https://docs.microsoft.com/sql/relational-databases/security/dynamic-data-masking?toc=%2Fazure%2Fsql-data-warehouse%2Ftoc.json&view=sql-server-2017#defining-a-dynamic-data-mask)
4242
- Submit a support ticket or vote [here](https://feedback.azure.com/forums/307516-sql-data-warehouse/suggestions/39040048-ssdt-support-dynamic-data-masking) to get the feature supported.
4343
- [PREDICT](https://docs.microsoft.com/sql/t-sql/queries/predict-transact-sql?view=sql-server-ver15&viewFallbackFrom=azure-sqldw-latest) function
44+
- [Tables with constraints](https://docs.microsoft.com/azure/sql-data-warehouse/sql-data-warehouse-table-constraints#table-constraints) are not supported. For these table objects, set the build action to "None".
4445

4546
## Next steps
4647

‎articles/storage/common/storage-samples-dotnet.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The following table provides an overview of our samples repository and the scena
1717
> [!NOTE]
1818
> These samples use the Azure Storage .NET v11 library. For v12 code, see [samples](https://github.com/Azure/azure-sdk-for-net/tree/master/sdk/storage/Azure.Storage.Blobs/samples) in the GitHub repository.
1919
20-
## Blob samples
20+
## Blob samples (v11)
2121

2222
| **Scenario** | **Sample Code** |
2323
|--------------|-----------------|
@@ -38,7 +38,7 @@ The following table provides an overview of our samples repository and the scena
3838
| Service Properties | [Getting Started with Blobs](https://github.com/Azure-Samples/storage-blob-dotnet-getting-started/blob/master/BlobStorage/Advanced.cs) |
3939
| Snapshot Blob | [Backup Azure Virtual Machine Disks with Incremental Snapshots](https://github.com/Azure-Samples/storage-blob-dotnet-back-up-with-incremental-snapshots/blob/master/Program.cs) |
4040

41-
## File samples
41+
## File samples (v11)
4242

4343
| **Scenario** | **Sample Code** |
4444
|--------------|-----------------|
@@ -52,7 +52,7 @@ The following table provides an overview of our samples repository and the scena
5252
| List Shares | [Azure Storage .NET File Storage Sample](https://github.com/Azure-Samples/storage-file-dotnet-getting-started/blob/9f12304b2f5f5472a1c87c1e21be4af5661ac043/FileStorage/Advanced.cs) |
5353
| Share Properties/Metadata/Stats | [Azure Storage .NET File Storage Sample](https://github.com/Azure-Samples/storage-file-dotnet-getting-started/blob/9f12304b2f5f5472a1c87c1e21be4af5661ac043/FileStorage/Advanced.cs) |
5454

55-
## Queue samples
55+
## Queue samples (v11)
5656

5757
| **Scenario** | **Sample Code** |
5858
|--------------|-----------------|
@@ -65,7 +65,7 @@ The following table provides an overview of our samples repository and the scena
6565
| Queue Service Properties | [Getting Started with Azure Queue Service in .NET](https://github.com/Azure-Samples/storage-queue-dotnet-getting-started/blob/master/QueueStorage/Advanced.cs) |
6666
| Update Message | [Getting Started with Azure Queue Service in .NET](https://github.com/Azure-Samples/storage-queue-dotnet-getting-started/blob/master/QueueStorage/GettingStarted.cs) |
6767

68-
## Table samples
68+
## Table samples (v11)
6969

7070
| **Scenario** | **Sample Code** |
7171
|--------------|-----------------|

‎articles/storage/common/storage-samples-java.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ ms.topic: sample
1414

1515
The following table provides an overview of our samples repository and the scenarios covered in each sample. Click on the links to view the corresponding sample code in GitHub.
1616

17-
## Blob samples
17+
> [!NOTE]
18+
> These samples use the Azure Storage Java v11 library. For v12 code, see [samples](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob) in the GitHub repository.
19+
20+
## Blob samples (v11)
1821

1922
| **Scenario** | **Sample Code** |
2023
|--------------|-----------------|
@@ -35,7 +38,7 @@ The following table provides an overview of our samples repository and the scena
3538
| Service Properties | [Getting Started with Azure Blob Service in Java](https://github.com/Azure-Samples/storage-blob-java-getting-started/blob/master/src/BlobAdvanced.java) |
3639
| Snapshot Blob | [Getting Started with Azure Blob Service in Java](https://github.com/Azure-Samples/storage-blob-java-getting-started/blob/master/src/BlobBasics.java) |
3740

38-
## File samples
41+
## File samples (v11)
3942

4043
| **Scenario** | **Sample Code** |
4144
|--------------|-----------------|
@@ -49,7 +52,7 @@ The following table provides an overview of our samples repository and the scena
4952
| List Shares | [Getting Started with Azure File Service in Java](https://github.com/Azure-Samples/storage-file-java-getting-started/blob/master/src/FileBasics.java) |
5053
| Share Properties/Metadata/Stats | [Getting Started with Azure File Service in Java](https://github.com/Azure-Samples/storage-file-java-getting-started/blob/master/src/FileAdvanced.java) |
5154

52-
## Queue samples
55+
## Queue samples (v11)
5356

5457
| **Scenario** | **Sample Code** |
5558
|--------------|-----------------|
@@ -62,7 +65,7 @@ The following table provides an overview of our samples repository and the scena
6265
| Queue Service Properties | [Getting Started with Azure Queue Service in Java](https://github.com/Azure-Samples/storage-queue-java-getting-started/blob/master/src/QueueAdvanced.java) |
6366
| Update Message | [Getting Started with Azure Queue Service in Java](https://github.com/Azure-Samples/storage-queue-java-getting-started/blob/master/src/QueueBasics.java)
6467
|
65-
## Table samples
68+
## Table samples (v11)
6669

6770
| **Scenario** | **Sample Code** |
6871
|--------------|-----------------|

‎articles/storage/common/storage-samples-javascript.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ ms.topic: sample
1414

1515
The following tables provide an overview of our samples repository and the scenarios covered in each sample. Click on the links to view the corresponding sample code in GitHub.
1616

17-
## Blob samples
17+
> [!NOTE]
18+
> These samples use the Azure Storage JavaScript v10 library. For v12 code, see [samples](https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/storage/storage-blob/samples) in the GitHub repository.
19+
20+
## Blob samples (v10)
1821

1922
| **Scenario** | **Sample Code** |
2023
|--------------|-----------------|
@@ -39,7 +42,7 @@ The following tables provide an overview of our samples repository and the scena
3942
| Set Cors rules | [Getting Started with Azure Blob Service in JavaScript](https://github.com/Azure-Samples/storage-blob-node-getting-started/blob/master/advanced.js#L152) |
4043
| Snapshot Blob | [Getting Started with Azure Blob Service in JavaScript](https://github.com/Azure-Samples/storage-blob-node-getting-started/blob/master/basic.js#L79) |
4144

42-
## File samples
45+
## File samples (v10)
4346

4447
| **Scenario** | **Sample Code** |
4548
|--------------|-----------------|
@@ -49,7 +52,7 @@ The following tables provide an overview of our samples repository and the scena
4952
| List Directories and Files | [Getting Started with Azure File Service in JavaScript](https://github.com/Azure-Samples/storage-file-node-getting-started/blob/master/fileSample.js#L115) |
5053
| List Shares | [Getting Started with Azure File Service in JavaScript](https://github.com/Azure-Samples/storage-file-node-getting-started/blob/master/fileSample.js#L187) |
5154

52-
## Queue samples
55+
## Queue samples (v10)
5356

5457
| **Scenario** | **Sample Code** |
5558
|--------------|-----------------|
@@ -67,7 +70,7 @@ The following tables provide an overview of our samples repository and the scena
6770
| Queue Stats | [Getting Started with Azure Queue Service in JavaScript](https://github.com/Azure-Samples/storage-queue-node-getting-started/blob/master/advanced.js#L149) |
6871
| Update Message | [Getting Started with Azure Queue Service in JavaScript](https://github.com/Azure-Samples/storage-queue-node-getting-started/blob/master/basic.js#L176) |
6972

70-
## Table samples
73+
## Table samples (v10)
7174

7275
| **Scenario** | **Sample Code** |
7376
|--------------|-----------------|

‎articles/storage/common/storage-samples-python.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ ms.topic: sample
1414

1515
The following tables provide an overview of our samples repository and the scenarios covered in each sample. Click on the links to view the corresponding sample code in GitHub.
1616

17-
## Blob samples
17+
> [!NOTE]
18+
> These samples use the Azure Storage Python v2.1 library. For v12 code, see [samples](https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/storage/azure-storage-blob/samples) in the GitHub repository.
19+
20+
## Blob samples (v2.1)
1821

1922
| **Scenario** | **Sample Code** |
2023
|--------------|-----------------|
@@ -35,7 +38,7 @@ The following tables provide an overview of our samples repository and the scena
3538
| Service Properties | [Getting Started with Azure Blob Service in Python](https://github.com/Azure-Samples/storage-blob-python-getting-started/blob/master/blob_advanced_samples.py#L540) |
3639
| Snapshot Blob | [Getting Started with Azure Blob Service in Python](https://github.com/Azure-Samples/storage-blob-python-getting-started/blob/master/blob_basic_samples.py#L214) |
3740

38-
## File samples
41+
## File samples (v2.1)
3942

4043
| **Scenario** | **Sample Code** |
4144
|--------------|-----------------|
@@ -49,7 +52,7 @@ The following tables provide an overview of our samples repository and the scena
4952
| List Shares | [Getting Started with Azure File Service in Python](https://github.com/Azure-Samples/storage-file-python-getting-started/blob/master/file_advanced_samples.py#L82) |
5053
| Share Properties/Metadata/Stats | [Getting Started with Azure File Service in Python](https://github.com/Azure-Samples/storage-file-python-getting-started/blob/master/file_advanced_samples.py#L144) |
5154

52-
## Queue samples
55+
## Queue samples (v2.1)
5356

5457
| **Scenario** | **Sample Code** |
5558
|--------------|-----------------|
@@ -62,7 +65,7 @@ The following tables provide an overview of our samples repository and the scena
6265
| Queue Service Properties | [Getting Started with Azure Queue Service in Python](https://github.com/Azure-Samples/storage-queue-python-getting-started/blob/master/queue_advanced_samples.py#L128) |
6366
| Update Message | [Getting Started with Azure Queue Service in Python](https://github.com/Azure-Samples/storage-queue-python-getting-started/blob/master/queue_basic_samples.py#L120) |
6467

65-
## Table samples
68+
## Table samples (v2.1)
6669

6770
| **Scenario** | **Sample Code** |
6871
|--------------|-----------------|

0 commit comments

Comments
 (0)