diff --git a/azuredeploy.json b/azuredeploy.json index 6e5a25e1d..6260e96b6 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -1,86 +1,95 @@ { - "$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "siteName": { - "type": "string" - }, - "hostingPlanName": { - "type": "string" - }, - "siteLocation": { - "type": "string" - }, - "sku": { - "type": "string", - "allowedValues": [ - "Free", - "Shared", - "Basic", - "Standard" - ], - "defaultValue": "Free" - }, - "workerSize": { - "type": "string", - "allowedValues": [ - "0", - "1", - "2" - ], - "defaultValue": "0" - }, - "repoUrl": { - "type": "string" - }, - "branch": { - "type": "string" - } + "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "siteName": { + "type": "string" }, - "resources": [{ - "apiVersion": "2015-04-01", - "name": "[parameters('hostingPlanName')]", - "type": "Microsoft.Web/serverFarms", - "location": "[parameters('siteLocation')]", - "properties": { - "sku": "[parameters('sku')]", - "workerSize": "[parameters('workerSize')]", - "numberOfWorkers": 1 - } - }, { - "apiVersion": "2015-08-01", + "hostingPlanName": { + "type": "string" + }, + "siteLocation": { + "type": "string" + }, + "sku": { + "type": "string", + "allowedValues": [ + "F1", + "B1", + "S1" + ], + "defaultValue": "F1" + }, + "repoUrl": { + "type": "string" + }, + "branch": { + "type": "string", + "defaultValue": "master" + } + }, + "resources": [ + { + "apiVersion": "2015-08-01", + "name": "[parameters('hostingPlanName')]", + "type": "Microsoft.Web/serverFarms", + "location": "[parameters('siteLocation')]", + "properties": { + + }, + "sku": { + "name": "[parameters('sku')]", + "capacity": 1 + } + }, + { + "apiVersion": "2015-08-01", + "name": "[parameters('siteName')]", + "type": "Microsoft.Web/Sites", + "location": "[parameters('siteLocation')]", + "dependsOn": [ + "[concat('Microsoft.Web/serverFarms/', parameters('hostingPlanName'))]" + ], + "properties": { "name": "[parameters('siteName')]", - "type": "Microsoft.Web/Sites", - "location": "[parameters('siteLocation')]", - "dependsOn": [ - "[resourceId('Microsoft.Web/serverfarms', parameters('hostingPlanName'))]" - ], - "tags": { - "[concat('hidden-related:', resourceGroup().id, '/providers/Microsoft.Web/serverfarms/', parameters('hostingPlanName'))]": "empty" + "serverFarmId": "[parameters('hostingPlanName')]", + "siteConfig": { + "localMySqlEnabled": true, + "appSettings": [ + { "name": "WEBSITE_MYSQL_ENABLED", "value": "0" }, + { "name": "WEBSITE_MYSQL_GENERAL_LOG", "value": "0" }, + { "name": "WEBSITE_MYSQL_SLOW_QUERY_LOG", "value": "0" }, + { "name": "WEBSITE_MYSQL_ARGUMENTS", "value": "--max_allowed_packet=16M" } + ] + } + }, + "resources": [ + { + "apiVersion": "2015-08-01", + "name": "web", + "type": "sourcecontrols", + "dependsOn": [ + "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]" + ], + "properties": { + "RepoUrl": "[parameters('repoUrl')]", + "branch": "[parameters('branch')]", + "IsManualIntegration": true + } }, - "properties": { - "serverFarmId": "[parameters('hostingPlanName')]", - "siteConfig": { - "appSettings": [] - }, - -Error: Parse error on line 65: -... }, }, "resource -----------------------^ -Expecting 'STRING' -}, - "resources": [{ - "apiVersion": "2015-08-01", - "name": "web", - "type": "sourcecontrols", - "dependsOn": [ - "[resourceId('Microsoft.Web/Sites', parameters('siteName'))]" - ], - "properties": { - "RepoUrl": "[parameters('repoUrl')]", - "branch": "[parameters('branch')]", - "IsManualIntegration": true - } - }] - }] -} \ No newline at end of file + { + "apiVersion": "2014-06-01", + "name": "web", + "type": "config", + "dependsOn": [ + "[concat('Microsoft.Web/sites/', parameters('siteName'))]" + ], + "properties": { + + "phpVersion": "5.5" + } + } + ] + } + ] +} diff --git a/package.json b/package.json index 9e100a0af..76b369cab 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "scripts": { "start": "node server" }, -"license": "Apache", -"engines": { - "node": "~0.10.0 || ~4.2.0" + "license": "Apache", + "engines": { + "node": "^6.9.4" } } diff --git a/server.js b/server.js index 411ae4d14..dee383381 100644 --- a/server.js +++ b/server.js @@ -1,8 +1,6 @@ -var http = require('http'); +const http = require('http'); -http.createServer(function (req, res) { - +http.createServer((req, res) => { res.writeHead(200, { 'Content-Type': 'text/html' }); res.end('Hello, world!'); - -}).listen(process.env.PORT || 8080); \ No newline at end of file +}).listen(process.env.PORT || 8080);