Let systemd do the supervising

Arangod can be launched in supervisor mode, which forks off child
processes and then restarts them if they die. This commit removes the
`--supervisor` option and relies on systemd to do the supervising.

3 files changed, 7 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b617f02953a..97fce7d70ccb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arangodb
 	pkgdesc = A multi-model NoSQL database, combining key-value, document and graph data models.
 	pkgver = 3.1.15
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.arangodb.com/
 	install = arangodb.install
 	arch = i686
@@ -27,7 +27,7 @@ pkgbase = arangodb
 	validpgpkeys = CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B
 	sha512sums = 46e8764fa949e7ade7d1e3d2707c49313b7cdc3b687f94807901ead4fd3b543c8980b2f1a75f09e0e27b73fcb4e9af63e24d115404861728269ff4e4ccbf831d
 	sha512sums = SKIP
-	sha512sums = 5f1a46324350dc9f08cfe8538df2cf3b73c41c3b6230c994bff26e47ea28f1e952c2d2138fc2b0064ceb8ea599a3e6f74bfa4384a87bdbc59d2607783cf3ea64
+	sha512sums = 18bccbc960555c600c86409a89545c1c056dbce9abcd5724cd61c54a734d9c974df0d01b0a49c1859299ffc448c3e576f8c2bcc6134ad3f5062293b11cf85091
 	sha512sums = b1fdf8cc0525d1fc093d02b24b18a1d8361fb2cd8274974269957ef8074a26eb4f2174bdd4abd41154d535df43cd9d553c1b8205cd5945e53674d25dfa3c533f
 	sha512sums = 8a73da7dfb9cc371ce7c72efd53afc04ede26a890cd7542c82c518bf3d7c5be38abfcad66235fc9cf9d63c9955ebcdbca4c1d7056b386b1b59bf61dc1887febd
 
diff --git a/PKGBUILD b/PKGBUILD
index cefdd8e47fbd..7dd2a5d5f990 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=arangodb
 pkgver=3.1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-model NoSQL database, combining key-value, document and graph data models."
 arch=("i686" "x86_64" "armv7l" "armv7h")
 url="https://www.arangodb.com/"
@@ -25,7 +25,7 @@ source=("https://www.arangodb.com/repositories/Source/ArangoDB-$pkgver.tar.bz2"
 validpgpkeys=('CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B') # Frank Celler (ArangoDB Debian Repository) <info@arangodb.com>
 sha512sums=('46e8764fa949e7ade7d1e3d2707c49313b7cdc3b687f94807901ead4fd3b543c8980b2f1a75f09e0e27b73fcb4e9af63e24d115404861728269ff4e4ccbf831d'
             'SKIP'
-            '5f1a46324350dc9f08cfe8538df2cf3b73c41c3b6230c994bff26e47ea28f1e952c2d2138fc2b0064ceb8ea599a3e6f74bfa4384a87bdbc59d2607783cf3ea64'
+            '18bccbc960555c600c86409a89545c1c056dbce9abcd5724cd61c54a734d9c974df0d01b0a49c1859299ffc448c3e576f8c2bcc6134ad3f5062293b11cf85091'
             'b1fdf8cc0525d1fc093d02b24b18a1d8361fb2cd8274974269957ef8074a26eb4f2174bdd4abd41154d535df43cd9d553c1b8205cd5945e53674d25dfa3c533f'
             '8a73da7dfb9cc371ce7c72efd53afc04ede26a890cd7542c82c518bf3d7c5be38abfcad66235fc9cf9d63c9955ebcdbca4c1d7056b386b1b59bf61dc1887febd')
 
diff --git a/arangodb3.service b/arangodb3.service
index f6a949e56d86..2c064f7cd318 100644
--- a/arangodb3.service
+++ b/arangodb3.service
@@ -17,12 +17,13 @@ After=sysinit.target sockets.target timers.target paths.target slices.target net
 
 [Service]
 PrivateTmp=yes
-Type=forking
+Type=simple
 User=arangodb
 Group=arangodb
+Restart=on-failure
 PIDFile=/run/arangodb3/arangod.pid
 ExecStartPre=/usr/bin/arangod --pid-file /run/arangodb3/arangod.pid --server.rest-server false --database.auto-upgrade true
-ExecStart=/usr/bin/arangod -c /etc/arangodb3/arangod.conf --pid-file /run/arangodb3/arangod.pid --temp.path /var/tmp/arangod3 --supervisor
+ExecStart=/usr/bin/arangod -c /etc/arangodb3/arangod.conf --pid-file /run/arangodb3/arangod.pid --temp.path /var/tmp/arangod3
 
 
 [Install]