Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Develop (#11)
Browse files Browse the repository at this point in the history
* Added solution and project to the develop branch.

* Added Events-Tenant User App.

* Updated solution file for project.

* Wording correction

suing to using

* Updated web deploy settings.

* Updated tenantcatalog name. Added base database to deployment.

* Check in WTP Tenant User Application code April 13

* Updated Azuredeploy.json ARM deployment template

* Updated ARM Template deployment.

* Pull Tenant User app to WingtipSaaS GitHub repository.

* Updated ARM Template deployment dependencies.

* Updated ARM Template deployment.

* Fixed refreshing image in web application and log in bug.

* Upload latest ARM Template update

* Update deployment template dependson structure and storage locations.
  • Loading branch information
AyoOlubeko authored May 9, 2017
1 parent 86084c5 commit 13003b7
Showing 1 changed file with 18 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
"customerCatalogEdition": "Standard",
"webAppSku": "Standard",
"tenantServer": "[concat(variables('tenantservername'),'-',variables('lowerCaseUser'))]",
"tenantContosoConcertHallStorageUri": "[concat('https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-bacpacsvnext/',variables('tenantContosoConcertHall'),'.bacpac')]",
"tenantFabrikamJazzClubStorageUri": "[concat('https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-bacpacsvnext/',variables('tenantFabrikamJazzClub'),'.bacpac')]",
"tenantDogwoodDojoStorageUri": "[concat('https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-bacpacsvnext/',variables('tenantDogwoodDojo'),'.bacpac')]",
"catalogDatabaseStorageUri": "https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-bacpacsvnext/wingtipcatalogdb.bacpac",
"baseTenantDatabaseStorageUri": "https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-bacpacsvnext/wingtiptenantdb.bacpac",
"tenantContosoConcertHallStorageUri": "[concat('https://wingtipsaas.blob.core.windows.net/bacpacs/',variables('tenantContosoConcertHall'),'.bacpac')]",
"tenantFabrikamJazzClubStorageUri": "[concat('https://wingtipsaas.blob.core.windows.net/bacpacs/',variables('tenantFabrikamJazzClub'),'.bacpac')]",
"tenantDogwoodDojoStorageUri": "[concat('https://wingtipsaas.blob.core.windows.net/bacpacs/',variables('tenantDogwoodDojo'),'.bacpac')]",
"catalogDatabaseStorageUri": "https://wingtipsaas.blob.core.windows.net/bacpacs/wingtipcatalogdb.bacpac",
"baseTenantDatabaseStorageUri": "https://wingtipsaas.blob.core.windows.net/bacpacs/wingtiptenantdb.bacpac",
"wtpTenantUserTrafficManagerUniqueDnsName": "[concat('events.wtp.',variables('lowerCaseUser'))]",
"wtpTenantUser": "[concat('eventswtp-',variables('lowerCaseUser'))]",
"wtpTenantUserAppPackageUri": "https://wtpdeploystorageaccount.blob.core.windows.net/wingtip-packagesvnext/tenantUserAppPackage.zip"
"wtpTenantUserAppPackageUri": "https://wingtipsaas.blob.core.windows.net/packages/tenantUserAppPackage.zip"

},
"resources": [
{
Expand Down Expand Up @@ -84,7 +85,7 @@
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('tenantServer'))]",
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/elasticpools/',variables('elasticPoolName'))]",
"AllowAllAzureIps"
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/firewallrules/AllowAllAzureIps')]"
],
"name": "[variables('tenantContosoConcertHall')]",
"location": "[variables('location')]",
Expand Down Expand Up @@ -116,7 +117,8 @@
{
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('tenantServer'))]",
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/elasticpools/',variables('elasticPoolName'))]"
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/elasticpools/',variables('elasticPoolName'))]",
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/firewallrules/AllowAllAzureIps')]"
],
"name": "[variables('tenantFabrikamJazzClub')]",
"location": "[variables('location')]",
Expand Down Expand Up @@ -148,7 +150,8 @@
{
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('tenantServer'))]",
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/elasticpools/',variables('elasticPoolName'))]"
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/elasticpools/',variables('elasticPoolName'))]",
"[concat('Microsoft.Sql/servers/',variables('tenantServer'),'/firewallrules/AllowAllAzureIps')]"
],
"name": "[variables('tenantDogwoodDojo')]",
"location": "[variables('location')]",
Expand Down Expand Up @@ -220,7 +223,7 @@
{
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('catalogServer'))]",
"AllowAllAzureIps"
"[concat('Microsoft.Sql/servers/',variables('catalogServer'),'/firewallrules/AllowAllAzureIps')]"
],
"name": "[variables('catalogDatabaseName')]",
"location": "[variables('location')]",
Expand Down Expand Up @@ -253,7 +256,8 @@
},
{
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('catalogServer'))]"
"[concat('Microsoft.Sql/servers/',variables('catalogServer'))]",
"[concat('Microsoft.Sql/servers/',variables('catalogServer'),'/firewallrules/AllowAllAzureIps')]"
],
"name": "[variables('baseTenantDB')]",
"location": "[variables('location')]",
Expand Down Expand Up @@ -287,8 +291,8 @@
{
"dependsOn": [
"[concat('Microsoft.Sql/servers/',variables('catalogServer'))]",
"[variables('baseTenantDB')]",
"[variables('catalogDatabaseName')]"
"[concat('Microsoft.Sql/servers/',variables('catalogServer'),'/databases/',variables('baseTenantDB'))]",
"[concat('Microsoft.Sql/servers/',variables('catalogServer'),'/databases/',variables('catalogDatabaseName'))]"
],
"apiVersion": "2014-04-01-preview",
"name": "Open",
Expand Down Expand Up @@ -357,7 +361,7 @@
"type": "config",
"name": "appsettings",
"properties": {
"BlobPath": "https://wtpdeploystorageaccount.blob.core.windows.net/imagesvnext/",
"BlobPath": "https://wingtipsaas.blob.core.windows.net/images/",
"ConnectionTimeOut": "30",
"CatalogDatabase": "[variables('catalogDatabaseName')]",
"CatalogServer": "[variables('catalogServer')]",
Expand Down

0 comments on commit 13003b7

Please sign in to comment.