updated passwords, open ping on vm

Java Containerization/README.md

@@ -25,11 +25,15 @@ To deploy this workshop environment, begin by navigating to the Azure portal at
 From the terminal window execute the following commands to clone the App Migration Workshop project.  Navigate to the Java migrate sub module and execute the deployment script substituting the target region name and resource group for which the resources will be deployed.
 
     git clone https://github.com/microsoft/MTC_APPContainerization.git
-    cd AzureMigrateJava
+    cd MTC_APPContainerization/Java\ Containerization/
     chmod +x scripts/deploy.sh
     ./scripts/deploy.sh '<REGION NAME>' '<RESOURCE GROUP>'
 
-Total deployment will take ~5 minutes.  When complete navigate to the resource group in the azure portal.  Find the created vm named TomcatServer click on its name.  
+For example:
+
+     ./scripts/deploy.sh 'westus' 'jm-rg2'
+
+Total deployment will take ~5 minutes.  When complete navigate to the newly created resource group in the azure portal.  Find the created vm named TomcatServer click on its name.  
 
 ![Tomcat VM.](../media/server.jpg)
 
@@ -37,5 +41,5 @@ Identify the public IP address provisioned for the VM.
 
 ![Public IP.](../media/ip.jpg)
 
-Use the IP address to access the Airsonic app at http://{ip}/airsonic
+Use the IP address to access the Airsonic app at http://{ip}:8080/airsonic
 ![Airsonic App.](../media/app.jpg)

Java Containerization/azuredeploy.json

@@ -38,7 +38,7 @@
         "description": "mysql java driver"
       }
     },
-    "adminUsername": {
+    "vmAdminUsername": {
       "type": "string",
       "metadata": {
         "description": "User name for the Virtual Machine."
@@ -81,7 +81,7 @@
         "description": "Type of authentication to use on the Virtual Machine. SSH key is recommended."
       }
     },
-    "adminPasswordOrKey": {
+    "vmAdminPasswordOrKey": {
       "type": "securestring",
       "metadata": {
         "description": "SSH Key or password for the Virtual Machine. SSH key is recommended."
@@ -144,17 +144,16 @@
     "publicIPAddressName": "myPublicIP",
     "virtualNetworkName": "MyVNET",
     "linuxConfiguration": {
-    "disablePasswordAuthentication": false
-//      "disablePasswordAuthentication": true,
-//      "ssh": {
-//        "publicKeys": [
-        //   {
-        //     "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]",
-        //     "keyData": "[parameters('adminPasswordOrKey')]"
-        //   }
-        // ]
-//      }
-    },
+      "disablePasswordAuthentication": true,
+      "ssh": {
+        "publicKeys": [
+           {
+             "path": "[concat('/home/', parameters('vmAdminUsername'), '/.ssh/authorized_keys')]",
+             "keyData": "[parameters('vmAdminPasswordOrKey')]"
+           }
+         ]
+      }
+      },
     "networkSecurityGroupName": "default-NSG"
   },
   "resources": [
@@ -203,6 +202,19 @@
               "sourcePortRange": "*",
               "destinationAddressPrefix": "*"
             }
+          },
+          {
+            "name": "default-allow-ping",
+            "properties": {
+              "priority": 1020,
+              "access": "Allow",
+              "direction": "Inbound",
+              "destinationPortRange": "*",
+              "protocol": "ICMP",
+              "sourceAddressPrefix": "*",
+              "sourcePortRange": "*",
+              "destinationAddressPrefix": "*"
+            }
           }
         ]
       }
@@ -298,7 +310,21 @@
               "priority": 112,
               "direction": "Inbound"
             }
-          }
+          },
+          {
+            "name": "Ping",
+            "properties": {
+              "description": "Allow ping",
+              "protocol": "ICMP",
+              "sourcePortRange": "*",
+              "destinationPortRange": "*",
+              "sourceAddressPrefix": "Internet",
+              "destinationAddressPrefix": "*",
+              "access": "Allow",
+              "priority": 101,
+              "direction": "Inbound"
+            }
+          }          
         ]
       }
     },
@@ -316,8 +342,8 @@
         },
         "osProfile": {
           "computerName": "[variables('vmName')]",
-          "adminUsername": "[parameters('adminUsername')]",
-          "adminPassword": "[parameters('adminPasswordOrKey')]",
+          "adminUsername": "[parameters('vmAdminUsername')]",
+          "adminPassword": "[parameters('vmAdminPasswordOrKey')]",
           "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('linuxConfiguration'))]"
         },
         "storageProfile": {
@@ -449,7 +475,7 @@
         "protectedSettings": {
           "commandToExecute": "[
               concat('sh setup-vm.sh',' ', 
-                parameters('adminUsername'), ' ', 
+                parameters('vmAdminUsername'), ' ', 
                 parameters('javaPackageName'),' ', 
                 parameters('tomcatPackageName'), ' ',
                 parameters('airsonicPackageName'), ' ',

Java Containerization/azuredeploy.parameters.json

@@ -17,8 +17,11 @@
     "mysqlDriverName": {
       "value":"https://downloads.mysql.com/archives/get/p/3/file/mysql-connector-java-5.1.48.tar.gz"
     },
-    "adminUsername": {
-      "value": "adminuser"
+    "vmAdminUsername": {
+      "value": "adminUser"
+    },
+    "vmAdminPasswordOrKey": {
+      "value": "password@123"
     },
     "mysqlAdminName": {
       "value": "mysqladmin"
@@ -32,9 +35,6 @@
     "mysqlClientPackage": {
       "value": "mysql-client-core-5.7"
     },
-    "adminPasswordOrKey": {
-      "value": "Super$ekr3tPa$sw0rd!"
-    },
     "_artifactsLocation": {
       "value": "https://raw.githubusercontent.com/microsoft/MTC_APPContainerization/main/Java%20Containerization/scripts/vm/"
     }