From aafb8edbef7a285fd4937336f31d8e06e1fa0dca Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Mon, 4 Dec 2017 11:34:57 +0100 Subject: [PATCH] Fixed default xds-agent port number and env var (XDS_AGENT_URL) Signed-off-by: Sebastien Douheret --- config.json.in | 2 +- lib/xdsserver/apiv1-folders.go | 2 +- 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 -