Skip to content

Commit

Permalink
Dev to main (#13)
Browse files Browse the repository at this point in the history 
Co-authored-by: XITASO\pawel.baran <pawel.baran@xitaso.com>
Co-authored-by: Moritz Hofer <moritz.hofer@xitaso.com>
Co-authored-by: Moritz Hofer <84278634+hofermo@users.noreply.github.com>
Co-authored-by: Pawel Baran <98280057+pawel-baran-se@users.noreply.github.com>
Co-authored-by: Melanie Gail <melanie.gail@xitaso.com>
Co-authored-by: Alina Geesen-Stucky <alina.geesen.ext@zeiss.com>
Co-authored-by: Milo Franke <milo.franke@xitaso.com>
Co-authored-by: m-weslati <mohamed.weslati@xitaso.com>
  • Loading branch information
@XAlinaGS @pawel-baran-se
@hofermo @GailMelanie @Xmilofranke @m-weslati
9 people committed Jun 27, 2024
1 parent 0f77ee5 commit e5bbff8
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions infrastructure/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"defaultValue": "[concat('mnestix-api-', parameters('randomId'))]",
"type": "string"
},
"mnestixViewerServiceName": {
"defaultValue": "[concat('mnestix-viewer-', parameters('randomId'))]",
"mnestixVBrowserServiceName": {
"defaultValue": "[concat('mnestix-browser-', parameters('randomId'))]",
"type": "string"
}
},
Expand All @@ -53,8 +53,8 @@
"mnestixApiServiceUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net'), '')]",
"mnestixApiProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/repo'), '')]",
"mnestixApiDiscoveryProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/discovery'), '')]",
"mnestixViewerServiceName": "[parameters('mnestixViewerServiceName')]",
"mnestixViewerUrl": "[uri(concat('https://', variables('mnestixViewerServiceName'), '.azurewebsites.net'), '')]",
"mnestixBrowserServiceName": "[parameters('mnestixBrowserServiceName')]",
"mnestixBrowserUrl": "[uri(concat('https://', variables('mnestixBrowserServiceName'), '.azurewebsites.net'), '')]",
"discoveryAppServiceName": "[concat('mnestix-basyx-discovery-', parameters('randomId'))]",
"discoveryAppServiceUrl": "[uri(concat('https://', variables('discoveryAppServiceName'), '.azurewebsites.net'), '')]"
},
Expand Down Expand Up @@ -528,11 +528,11 @@
{
"type": "Microsoft.Web/sites",
"apiVersion": "2021-03-01",
"name": "[variables('mnestixViewerServiceName')]",
"name": "[variables('mnestixBrowserServiceName')]",
"location": "[parameters('location')]",
"kind": "app,linux,container",
"properties": {
"name": "[variables('mnestixViewerServiceName')]",
"name": "[variables('mnestixBrowserServiceName')]",
"siteConfig": {
"appSettings": [
{
Expand All @@ -553,7 +553,7 @@
},
{
"name": "FRONTEND_URL",
"value": "[variables('mnestixViewerUrl')]"
"value": "[variables('mnestixBrowserUrl')]"
},
{
"name": "AAS_REPO_API_URL",
Expand All @@ -580,12 +580,12 @@
"value": "[parameters('applicationIdUri')]"
}
],
"linuxFxVersion": "DOCKER|mnestix/mnestix-browser:1.0.0-latest",
"linuxFxVersion": "DOCKER|mnestix/mnestix-browser:latest",
"alwaysOn": true
},
"hostNameSslStates": [
{
"name": "[variables('mnestixViewerUrl')]",
"name": "[variables('mnestixBrowserUrl')]",
"sslState": "Disabled",
"hostType": "Standard"
}
Expand Down
18 changes: 9 additions & 9 deletions infrastructure/migration/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"defaultValue": "[concat('mnestix-api-', parameters('randomId'))]",
"type": "string"
},
"mnestixViewerServiceName": {
"defaultValue": "[concat('mnestix-viewer-', parameters('randomId'))]",
"mnestixBrowserServiceName": {
"defaultValue": "[concat('mnestix-browser-', parameters('randomId'))]",
"type": "string"
},
"serverFarmsName": {
Expand All @@ -52,8 +52,8 @@
"mnestixApiServiceUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net'), '')]",
"mnestixApiProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/repo'), '')]",
"mnestixApiDiscoveryProxyUrl": "[uri(concat('https://', variables('mnestixApiServiceName'), '.azurewebsites.net', '/discovery'), '')]",
"mnestixViewerServiceName": "[parameters('mnestixViewerServiceName')]",
"mnestixViewerUrl": "[uri(concat('https://', variables('mnestixViewerServiceName'), '.azurewebsites.net'), '')]",
"mnestixBrowserServiceName": "[parameters('mnestixBrowserServiceName')]",
"mnestixBrowserUrl": "[uri(concat('https://', variables('mnestixBrowserServiceName'), '.azurewebsites.net'), '')]",
"discoveryAppServiceName": "[concat('mnestix-basyx-discovery-', parameters('randomId'))]",
"discoveryAppServiceUrl": "[uri(concat('https://', variables('discoveryAppServiceName'), '.azurewebsites.net'), '')]",
"discoveryPrivateEndpointName": "[concat('mnestix-discovery-basyx-private-endpoint-', parameters('randomId'))]"
Expand Down Expand Up @@ -149,11 +149,11 @@
{
"type": "Microsoft.Web/sites",
"apiVersion": "2021-03-01",
"name": "[variables('mnestixViewerServiceName')]",
"name": "[variables('mnestixBrowserServiceName')]",
"location": "[parameters('location')]",
"kind": "app,linux,container",
"properties": {
"name": "[variables('mnestixViewerServiceName')]",
"name": "[variables('mnestixBrowserServiceName')]",
"siteConfig": {
"appSettings": [
{
Expand All @@ -174,7 +174,7 @@
},
{
"name": "FRONTEND_URL",
"value": "[variables('mnestixViewerUrl')]"
"value": "[variables('mnestixBrowserUrl')]"
},
{
"name": "AAS_REPO_API_URL",
Expand All @@ -201,12 +201,12 @@
"value": "[parameters('applicationIdUri')]"
}
],
"linuxFxVersion": "DOCKER|mnestix/mnestix-browser:1.0.0-latest",
"linuxFxVersion": "DOCKER|mnestix/mnestix-browser:latest",
"alwaysOn": true
},
"hostNameSslStates": [
{
"name": "[variables('mnestixViewerUrl')]",
"name": "[variables('mnestixBrowserUrl')]",
"sslState": "Disabled",
"hostType": "Standard"
}
Expand Down

0 comments on commit e5bbff8

Please sign in to comment.