aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-01-28 12:02:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-01-28 12:02:10 +0200
commit3fd741756f8b1f75c3051c4c8ba36b56c5175a48 (patch)
treebb81d68d1796bf854f8a489a19168d0c445279de
parent6c547f17e3e9d6cb36022050d94d9817c4356a55 (diff)
Clean temporary backwards-compatibility stuff from bbot-agent@.service
-rw-r--r--bbot/bbot-agent@.service8
1 files changed, 5 insertions, 3 deletions
diff --git a/bbot/bbot-agent@.service b/bbot/bbot-agent@.service
index 43b9e8c..58f22a5 100644
--- a/bbot/bbot-agent@.service
+++ b/bbot/bbot-agent@.service
@@ -28,7 +28,7 @@ Environment=CONNECT_TIMEOUT=60
Environment=REQUEST_TIMEOUT=300
Environment=REQUEST_RETRIES=4
-Environment=TOOLCHAIN_NAME=%i
+Environment=TOOLCHAIN_NAME=default
Environment=TOOLCHAIN_NUM=1
Environment=TOOLCHAIN_VER=
Environment=TOOLCHAIN_ID=
@@ -36,7 +36,9 @@ Environment=TOOLCHAIN_ID=
Environment="CONTROLLER_URL="
Environment="CONTROLLER_TRUST="
-ExecStart=/build/bots/%i/bin/bbot-agent \
+# Note that we cannot use ${TOOLCHAIN_NAME} in the first word of ExecStart.
+#
+ExecStart=/build/bots/default/bin/bbot-agent \
--systemd-daemon \
--verbose ${VERBOSE} \
--auth-key ${AUTH_KEY} \
@@ -53,7 +55,7 @@ ExecStart=/build/bots/%i/bin/bbot-agent \
--toolchain-num ${TOOLCHAIN_NUM} \
--toolchain-ver ${TOOLCHAIN_VER} \
--toolchain-id ${TOOLCHAIN_ID} \
- --instance 1 \
+ --instance %i \
$CONTROLLER_TRUST \
$CONTROLLER_URL