document deployment better, create systemd service for main test job, unify some systemd scripts via %h

4 files changed, 9 insertions, 22 deletions

diff --git a/systemd-services/buildbot-worker-demo-auditor.service b/systemd-services/buildbot-worker-auditor.service
index 1151b89..8e350e1 100644
--- a/systemd-services/buildbot-worker-demo-auditor.service
+++ b/systemd-services/buildbot-worker-auditor.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Buildbot worker service for demo-auditor
-AssertPathExists=/home/demo-auditor/worker
+Description=Buildbot worker service for auditor
+AssertPathExists=%h/worker
 
 [Service]
-WorkingDirectory=/home/demo-auditor/
+WorkingDirectory=%h
 ExecStart=/usr/local/bin/buildbot-worker start --nodaemon worker
 ExecReload=/usr/local/bin/buildbot-worker restart --nodaemon worker
 ExecStop=/usr/local/bin/buildbot-worker stop worker
diff --git a/systemd-services/buildbot-worker-test-auditor.service b/systemd-services/buildbot-worker-taler-healthcheck.service
index 6cb1429..00ab298 100644
--- a/systemd-services/buildbot-worker-test-auditor.service
+++ b/systemd-services/buildbot-worker-taler-healthcheck.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Buildbot worker service for test-auditor
-AssertPathExists=/home/test-auditor/worker
+Description=Buildbot worker service for taler-healthcheck
+AssertPathExists=%h/worker
 
 [Service]
-WorkingDirectory=/home/test-auditor/
+WorkingDirectory=%h
 ExecStart=/usr/local/bin/buildbot-worker start --nodaemon worker
 ExecReload=/usr/local/bin/buildbot-worker restart --nodaemon worker
 ExecStop=/usr/local/bin/buildbot-worker stop worker
diff --git a/systemd-services/buildbot-worker-taler-test-healthcheck.service b/systemd-services/buildbot-worker-taler-test-healthcheck.service
deleted file mode 100644
index 1973640..0000000
--- a/systemd-services/buildbot-worker-taler-test-healthcheck.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Buildbot worker service for taler-test-healthcheck
-AssertPathExists=/home/taler-test-healthcheck/worker
-
-[Service]
-WorkingDirectory=/home/taler-test-healthcheck/
-ExecStart=/usr/local/bin/buildbot-worker start --nodaemon worker
-ExecReload=/usr/local/bin/buildbot-worker restart --nodaemon worker
-ExecStop=/usr/local/bin/buildbot-worker stop worker
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/systemd-services/buildbot-worker-taler-demo-healthcheck.service b/systemd-services/buildbot-worker-taler.service
index ce9ab42..460298b 100644
--- a/systemd-services/buildbot-worker-taler-demo-healthcheck.service
+++ b/systemd-services/buildbot-worker-taler.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=Buildbot worker service for taler-demo-healthcheck
-AssertPathExists=/home/taler-demo-healthcheck/worker
+Description=Buildbot worker service for the main deployment (runs exchange, merchant, sync)
+AssertPathExists=%h/bb-worker
 
 [Service]
-WorkingDirectory=/home/taler-demo-healthcheck/
+WorkingDirectory=%h
 ExecStart=/usr/local/bin/buildbot-worker start --nodaemon worker
 ExecReload=/usr/local/bin/buildbot-worker restart --nodaemon worker
 ExecStop=/usr/local/bin/buildbot-worker stop worker