Enrollment url by default same VM

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -61,7 +61,7 @@
         "roleNameHelpMsg" : "should be in minimum 3 characters long and do not include any whitespaces."
     },
     "generalConfig" : {
-        "host" : "https://localhost:9443",
+        "host" : "%https.ip%",
         "companyName" : "WSO2 Carbon Device Manager",
         "browserTitle" : "WSO2 Device Manager",
         "copyrightPrefix" : "\u00A9 %date-year%, ",

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.dashboard/dashboard.js

@@ -25,6 +25,6 @@ function onRequest(context) {
     viewModel.permissions = userModule.getUIPermissions();
     new Log().debug("## Permissions : " + stringify(userModule.getUIPermissions()));
     //TODO: Move enrollment URL into app-conf.json
-    viewModel.enrollmentURL = mdmProps.enrollmentUrl;
+    viewModel.enrollmentURL = mdmProps.generalConfig.host +  mdmProps.enrollmentDir;
     return viewModel;
 }