Update the ARM Template and related files

Author: TylerLu

azuredeploy.json

@@ -9,11 +9,18 @@
         "description": "The name of the web client app that you wish to create."
       }
     },
-    "hostingPlanName": {
+    "mySqlAdministratorLogin": {
       "type": "string",
-      "defaultValue": "EDUGraphAPIPython",
+      "defaultValue": "azureuser",
+      "metadata": {
+        "description": "The administrator login of the MySQL."
+      }
+    },
+    "mySqlAdministratorLoginPassword": {
+      "type": "securestring",
+      "defaultValue": "P@ssw0rd",
       "metadata": {
-        "description": "The hosting service plan name that you wish to create."
+        "description": "The administrator login password of the MySQL."
       }
     },
     "sourceCodeRepositoryURL": {
@@ -45,37 +52,76 @@
       }
     },
     "clientSecret": {
-      "type": "string",
+      "type": "securestring",
       "defaultValue": "",
       "metadata": {
         "description": ""
       }
+    },
+    "clientCertificatePath": {
+      "type": "string",
+      "defaultValue": "app_only_cert.pfx",
+      "metadata": {
+        "description": "Path of the app-only certificate."
+      }
+    },
+    "clientCertificatePassword": {
+      "type": "securestring",
+      "defaultValue": "J48W23RQeZv85vj",
+      "metadata": {
+        "description": "Password of the app-only certificate."
+      }
     }
   },
   "variables": {
     "location": "[resourceGroup().location]",
-    "lowerSiteName": "[toLower(parameters('siteName'))]",
-    "webSiteName": "[variables('lowerSiteName')]",
+    "hostingPlanName": "[parameters('siteName')]",
+    "webSiteName": "[toLower(parameters('siteName'))]",
+    "mySQLName": "[variables('webSiteName')]",
     "pythonSiteExtensionName": "python353x64"
   },
   "resources": [
     {
       "type": "Microsoft.Web/serverfarms",
       "sku": {
-        "name": "F1",
-        "tier": "Free",
-        "size": "F1",
-        "family": "F",
+        "name": "B1",
+        "tier": "Basic",
+        "size": "B1",
+        "family": "B",
         "capacity": 0
       },
-      "name": "[parameters('hostingPlanName')]",
+      "name": "[variables('hostingPlanName')]",
       "apiVersion": "2015-08-01",
       "location": "[variables('location')]",
       "properties": {
-        "name": "[parameters('hostingPlanName')]",
+        "name": "[variables('hostingPlanName')]",
         "numberOfWorkers": 1
       }
     },
+    {
+      "type": "Microsoft.DBforMySQL/servers",
+      "apiVersion": "2017-12-01-preview",
+      "kind": "",
+      "location": "[variables('location')]",
+      "name": "[variables('mySQLName')]",
+      "properties": {
+          "version": "5.7",
+          "administratorLogin": "[parameters('mySqlAdministratorLogin')]",
+          "administratorLoginPassword": "[parameters('mySqlAdministratorLoginPassword')]",
+          "storageProfile": {
+              "storageMB": 5120,
+              "backupRetentionDays": "7",
+              "geoRedundantBackup": "Disabled"
+          }
+      },
+      "sku": {
+          "name": "B_Gen4_1",
+          "family": "Gen4",
+          "tier": "Basic",
+          "capacity": 1,
+          "size": 5120
+      }
+    },
     {
       "type": "Microsoft.Web/sites",
       "kind": "app",
@@ -84,7 +130,10 @@
       "location": "[variables('location')]",
       "properties": {
         "name": "[variables('webSiteName')]",
-        "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', parameters('hostingPlanName'))]"
+        "serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('hostingPlanName'))]",
+        "siteConfig": {
+          "AlwaysOn": true
+        }
       },
       "resources": [
         {
@@ -106,6 +155,11 @@
           "properties": {
             "ClientId": "[parameters('clientId')]",
             "ClientSecret": "[parameters('clientSecret')]",
+            "ClientCertificatePath": "[parameters('clientCertificatePath')]",
+            "ClientCertificatePassword": "[parameters('clientCertificatePassword')]",
+            "MySQLHost": "[concat(variables('mySQLName'), '.mysql.database.azure.com')]",
+            "MySQLUser": "[parameters('mySqlAdministratorLogin')]",
+            "MySQLPassword": "[parameters('mySqlAdministratorLoginPassword')]",
             "SourceCodeRepositoryUrl": "[parameters('SourceCodeRepositoryUrl')]",
             "command": "deploy.cmd"
           }
@@ -126,7 +180,7 @@
         }
       ],
       "dependsOn": [
-        "[resourceId('Microsoft.Web/serverfarms', parameters('hostingPlanName'))]"
+        "[resourceId('Microsoft.Web/serverfarms', variables('hostingPlanName'))]"
       ]
     }
   ]

deploy.cmd

@@ -126,6 +126,9 @@ IF EXIST "%DEPLOYMENT_SOURCE%\web.%PYTHON_VER%.config" (
 ::  %PYTHON_EXE% manage.py collectstatic --noinput --clear
 ::)
 
+:: 6. Deploy WebJobs
+xcopy /y/s "%DEPLOYMENT_SOURCE%\webjobs" "%DEPLOYMENT_TARGET%\App_Data\jobs\triggered\"
+
 popd
 
 :postPython

requirements.txt

@@ -1,4 +1,10 @@
+# web app
 adal==0.5.1
 msgraph==0.1.2
 PyJWT==1.6.1
-mysqlclient==1.3.12
+mysqlclient==1.3.12
+
+# other packages used by data sync webjob
+peewee==3.3.4
+cryptography==2.2.2
+pyopenssl==17.5.0

webjobs/data_sync/requirements.txt

@@ -1,4 +1,4 @@
-adal=0.5.1
-peewee=3.3.3
+adal==0.5.1
+peewee==3.3.4
 cryptography==2.2.2
-pyopenssl==17.5.0
+pyopenssl==17.5.0