Skip to content

Commit 05bec75

Browse files
authored
Merge pull request #77 from logicmonitor/tls-version-configurable-arm-template
Keeping TLS version configurable in the template
2 parents d7125bf + a54bc31 commit 05bec75

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

arm-template-deployment/deployRGParent.json

+22
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,23 @@
8282
"description": "Enable Activity logs to be sent to the event hub that will get created in this deployment"
8383
},
8484
"defaultValue": "Yes"
85+
},
86+
"TLSVersionStorageAccount": {
87+
"type": "string",
88+
"defaultValue": "1_2",
89+
"metadata": {
90+
"description": "Provide an appropriate TLS version for storage account. Format - X_X"
91+
}
92+
},
93+
"TLSVersionFunctionApp": {
94+
"type": "string",
95+
"defaultValue": "1.3",
96+
"metadata": {
97+
"description": "Provide an appropriate TLS version for function app. Format - X.X"
98+
}
8599
}
100+
101+
86102
},
87103
"resources": [
88104
{
@@ -138,6 +154,12 @@
138154
},
139155
"Resource_Type": {
140156
"value": "[parameters('Resource_Type')]"
157+
},
158+
"TLSVersionStorageAccount": {
159+
"value": "[parameters('TLSVersionStorageAccount')]"
160+
},
161+
"TLSVersionFunctionApp": {
162+
"value": "[parameters('TLSVersionFunctionApp')]"
141163
}
142164
}
143165
},

arm-template-deployment/deployResourcesInRG.json

+11-3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
},
3535
"Resource_Type": {
3636
"type": "string"
37+
},
38+
"TLSVersionStorageAccount" : {
39+
"type" : "string"
40+
},
41+
"TLSVersionFunctionApp" : {
42+
"type" : "string"
3743
}
3844
},
3945
"variables": {
@@ -46,7 +52,8 @@
4652
"functionServerfarms": "[concat(variables('eventhubNamespace'),'-service-plan')]",
4753
"listener": "listener",
4854
"sender": "sender",
49-
"lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]"
55+
"lm_auth": "[concat('{ \"LM_ACCESS_ID\" : \"',parameters('LM_Access_Id'),'\", \"LM_ACCESS_KEY\" : \"', parameters('LM_Access_Key'), '\", \"LM_BEARER_TOKEN\" : \"', parameters('LM_Bearer_Token'), '\" }')]",
56+
"tlsVersionStorageAccount" : "[concat('TLS',parameters('TLSVersionStorageAccount'))]"
5057
},
5158
"resources": [
5259
{
@@ -74,7 +81,7 @@
7481
"apiVersion": "2019-06-01",
7582
"location": "[resourceGroup().location]",
7683
"properties": {
77-
"minimumTlsVersion": "TLS1_2",
84+
"minimumTlsVersion": "[variables('tlsVersionStorageAccount')]",
7885
"encryption": {
7986
"services": {
8087
"file": {
@@ -209,7 +216,8 @@
209216
"name": "RESOURCE_TYPE",
210217
"value": "[Parameters('Resource_Type')]"
211218
}
212-
]
219+
],
220+
"minTlsVersion" : "[parameters('TLSVersionFunctionApp')]"
213221
}
214222
},
215223
"dependsOn": [

0 commit comments

Comments
 (0)