diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-12-04 11:34:57 +0100 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2017-12-05 11:10:35 +0100 |
| commit | aafb8edbef7a285fd4937336f31d8e06e1fa0dca (patch) | |
| tree | a2d5cb79f3325270ed13cfe44712f46ceff515ce | |
| parent | 40d77d7b1d1b41bd1f2f5a00037d21858114e188 (diff) | |
Fixed default xds-agent port number and env var (XDS_AGENT_URL)
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
| -rw-r--r-- | config.json.in | 2 | ||||
| -rw-r--r-- | lib/xdsserver/apiv1-folders.go | 2 | ||||
| -rw-r--r-- | webapp/src/index.html | 23 |
3 files changed, 16 insertions, 11 deletions
diff --git a/config.json.in b/config.json.in index 3dcc04a..ac2f891 100644 --- a/config.json.in +++ b/config.json.in @@ -1,6 +1,6 @@ { "webAppDir": "www", - "httpPort": "8010", + "httpPort": "8000", "shareRootDir": "${HOME}/.xds-server/projects", "logsDir": "/tmp/xds-server/logs", "sdkRootDir": "/xdt/sdk", diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go index cac83ab..009d2ce 100644 --- a/lib/xdsserver/apiv1-folders.go +++ b/lib/xdsserver/apiv1-folders.go @@ -74,7 +74,7 @@ func (s *APIService) addFolder(c *gin.Context) { return } fd.WriteString("# XDS project settings\n") - fd.WriteString("export XDS_SERVER_URL=" + c.Request.Host + "\n") + fd.WriteString("export XDS_AGENT_URL=" + c.Request.Host + "\n") fd.WriteString("export XDS_PROJECT_ID=" + newFld.ID + "\n") if newFld.DefaultSdk == "" { sdks := s.sdks.GetAll() diff --git a/webapp/src/index.html b/webapp/src/index.html index 45ac90d..3109d2e 100644 --- a/webapp/src/index.html +++ b/webapp/src/index.html @@ -5,7 +5,6 @@ XDS Server </title> <link rel="icon" type="image/x-icon" href="assets/favicon.ico"> - <link rel="stylesheet" href="font-awesome.min.css"> <style> @@ -58,38 +57,44 @@ <h1 id="title">X(cross) Development System</h1> - <h2>Please start XDS agent on your machine<br> and + <h2>Please start XDS agent on your machine + <br> and <br> connect to XDS Dashboard </h2> <button id="dashbButton"> - Try to connect to dashboard<br> - http://localhost:8000 + Try to connect to dashboard + <br> http://localhost:8800 </button> <script type="text/javascript"> document.getElementById("dashbButton").onclick = function () { - location.href = "http://localhost:8000"; + location.href = "http://localhost:8800"; }; </script> <i style="font:xx-small;">(URL may depend on your configuration)</i> - <br><br><br> + <br> + <br> + <br> <h2>For more information, please refer to XDS User's Guide:</h2> <ul> <li> <a href="http://docs.automotivelinux.org/docs/devguides/en/dev/reference/xds/part-1/1_install-client.html"> - Install instructions <i class="fa fa-external-link" aria-hidden="true"></i> + Install instructions + <i class="fa fa-external-link" aria-hidden="true"></i> </a> </li> <li> <a href="http://docs.automotivelinux.org/docs/devguides/en/dev/#xcross-development-system-user's-guide"> - Online User's guide <i class="fa fa-external-link" aria-hidden="true"></i> + Online User's guide + <i class="fa fa-external-link" aria-hidden="true"></i> </a> </li> <li> <a href="http://iot.bzh/download/public/2017/XDS/docs/XDS_UsersGuide.pdf"> - User's guide (PDF file) <i class="fa fa-external-link" aria-hidden="true"></i> + User's guide (PDF file) + <i class="fa fa-external-link" aria-hidden="true"></i> </a> </li> </ul> |