Skip to content

Commit

Permalink
Remove the code related to starting vncserver. (gocd#4005)
Browse files Browse the repository at this point in the history
* Users having the old bootstrapper will not be affected by this change.
  • Loading branch information
varshavaradarajan authored and ketan committed Nov 30, 2017
1 parent 4ddd8d8 commit cdf6722
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
8 changes: 2 additions & 6 deletions installers/go-agent/release/agent.sh
Expand Up @@ -95,7 +95,6 @@ AGENT_DIR="$(cd "$CWD" && pwd)"

AGENT_MEM=${AGENT_MEM:-"128m"}
AGENT_MAX_MEM=${AGENT_MAX_MEM:-"256m"}
VNC=${VNC:-"N"}
AGENT_WORK_DIR="${AGENT_WORK_DIR:-$AGENT_DIR}"


Expand All @@ -119,11 +118,8 @@ else
PID_FILE="$AGENT_WORK_DIR/go-agent.pid"
fi

if [ "$VNC" == "Y" ]; then
echo "[$(date)] Starting up VNC on :3"
/usr/bin/vncserver :3
DISPLAY=:3
export DISPLAY
if [ ! -z ${VNC+x} ]; then
yell "Support for the variable VNC has been removed. Please see https://github.com/gocd/gocd/issues/4005#issuecomment-348138015 for alternatives."
fi

AGENT_STARTUP_ARGS="-Dcruise.console.publish.interval=10 -Xms$AGENT_MEM -Xmx$AGENT_MAX_MEM $GO_AGENT_SYSTEM_PROPERTIES"
Expand Down
3 changes: 1 addition & 2 deletions installers/go-agent/release/go-agent.default
@@ -1,3 +1,2 @@
GO_SERVER_URL=https://127.0.0.1:8154/go
AGENT_WORK_DIR=/var/lib/${SERVICE_NAME:-go-agent}
VNC=N
AGENT_WORK_DIR=/var/lib/${SERVICE_NAME:-go-agent}

0 comments on commit cdf6722

Please sign in to comment.