Add rc script config /etc/default/teamcity-agent

etc/default/teamcity-agent

@@ -0,0 +1,5 @@
+# AGENTS_ROOT="/usr/local/teamcity-agents"
+# DATA_ROOT="/var/lib/teamcity/BuildAgents"
+# DEFAULT_TEAMCITY_AGENT="buildAgent"
+# DEFAULT_TEAMCITY_SERVER="http://teamcity.fqdn"
+# DEFAULT_AGENT_USER="teamcity"

etc/init.d/teamcity-agent

@@ -18,20 +18,35 @@ set -e
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 AGENTS_ROOT="/usr/local/teamcity-agents"
 DATA_ROOT="/var/lib/teamcity/BuildAgents"
+DEFAULT_TEAMCITY_AGENT="buildAgent"
+DEFAULT_TEAMCITY_SERVER=""
+DEFAULT_AGENT_USER="teamcity"
+
+[ -r /etc/default/teamcity-agent ] && . /etc/default/teamcity-agent
+
+detect_user() {
+    # Get agent's work dir owner
+    stat -c '%U' "$AGENTS_ROOT/$1"
+}
 
 d_start() {
-    su - teamcity -c "(. ~/.teamcityrc; cd $AGENTS_ROOT/$1; $AGENTS_ROOT/$1/bin/agent.sh start)"
+    su - $(detect_user $1) -c "(. ~/.teamcityrc; cd $AGENTS_ROOT/$1; $AGENTS_ROOT/$1/bin/agent.sh start)"
 }
 
 d_stop() {
-    su - teamcity -c "(. ~/.teamcityrc; cd $AGENTS_ROOT/$1; $AGENTS_ROOT/$1/bin/agent.sh stop kill)"
+    su - $(detect_user $1) -c "(. ~/.teamcityrc; cd $AGENTS_ROOT/$1; $AGENTS_ROOT/$1/bin/agent.sh stop kill)"
+}
+
+d_status() {
+    su - $(detect_user $1) -c "(. ~/.teamcityrc; cd $AGENTS_ROOT/$1; $AGENTS_ROOT/$1/bin/agent.sh status short)"
 }
 
 d_install() {
-    NAME=$1
-    SERVER_URL=$2
+    NAME="$1"
+    SERVER_URL="${2:-$DEFAULT_TEAMCITY_SERVER}"
+    AGENT_USER="${3:-$DEFAULT_AGENT_USER}"
     if [ -z "$NAME" -o -z "$SERVER_URL" ]; then
-        echo "Usage /etc/init.d/teamcity-agent install <teamcity-agent-name> <teamcity.server.url>"
+        echo "Usage /etc/init.d/teamcity-agent install <teamcity-agent-name> [<teamcity.server.url>] [<user>]"
         exit 1;
     else
         echo Downloading TeamCity Agent from $SERVER_URL...
@@ -56,18 +71,15 @@ d_install() {
             | sed "s,^systemDir=.*$,systemDir=$SYSTEM_DIR,g" \
             | sed "s,^ownPort=.*$,ownPort=$OWN_PORT,g" \
         > $AGENTS_ROOT/$NAME/conf/buildAgent.properties
-        chown -R teamcity $AGENTS_ROOT/$NAME
+        chown -R $AGENT_USER $AGENTS_ROOT/$NAME
         echo "Agent installed to $AGENTS_ROOT/$NAME with follow options:"
         cat $AGENTS_ROOT/$NAME/conf/buildAgent.properties | egrep -v "^#" | egrep -v "^[[:space:]]*$"
         echo "To start/stop/restart agent use:"
         echo "sudo /etc/init.d/teamcity-agent (start|stop|restart) $NAME"
     fi
 }
 
-teamcity_agent_name="$2"
-if [ -z "$teamcity_agent_name" ]; then
-    teamcity_agent_name="buildAgent"
-fi
+teamcity_agent_name="${2:-$DEFAULT_TEAMCITY_AGENT}"
 
 case "$1" in
     start)
@@ -84,16 +96,18 @@ case "$1" in
         sleep 1
         d_start $teamcity_agent_name
         ;;
+    status)
+        d_status $teamcity_agent_name
+        ;;
     list)
         find $AGENTS_ROOT -maxdepth 1 -mindepth 1 -type d -printf '%f\n' | sort
         ;;
     install)
-        shift
-        echo "Installing new agent $1 connected to $2"
-        d_install $1 $2
+        echo "Installing new agent $teamcity_agent_name connected to $3"
+        d_install $teamcity_agent_name $3 $4
         ;;
     *)
-        echo "Usage: /etc/init.d/teamcity-agent {start|stop|restart|install} [<teamcity-agent-name>] [<teamcity.server.url>]" >&2
+        echo "Usage: /etc/init.d/teamcity-agent {start|stop|restart|status|install} [<teamcity-agent-name>] [<teamcity.server.url>] [<user>]" >&2
         exit 1
         ;;
 esac