From bfbd5086c8b10947ae2e0f5ec293b8a77511de6c Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Sat, 26 Sep 2020 00:11:42 +0200
Subject: [PATCH] Bugfixes.

---
 dev-util/drone/Manifest            |  4 ++--
 dev-util/drone/files/drone.service |  4 ++--
 dev-util/drone/files/drone.sh      | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 6e75225..acb3534 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -3,8 +3,8 @@ AUX drone-1.2.3.confd 1272 BLAKE2B 9722097b271e1b688559d2fbcd0e91decc03deaf868e9
 AUX drone-1.2.3.initd 1893 BLAKE2B 341983efd9f7e40f702d78782f9d0bc29ca4e919057dde742a4d49291fea61af82b0e474232f83b361894925608919674c7620447743e7b1c4b4bca70db52997 SHA512 887984ae903f2b162cb43b8fb5b5019f742a1891208a3f3f54ef6681a32aa279bcf4b9c758dc7652abbfd245bc2af38c0c199ff90b4a88c6bc00d55942592df2
 AUX drone-1.5.1.confd 1272 BLAKE2B 9722097b271e1b688559d2fbcd0e91decc03deaf868e91c62fe26c88b4f72806fc0fd628f4b47750ff707904bd88c5223ae58f0360a1c563ffe7bb11e08446fc SHA512 3960d26f6fa41eb3c6e9ccc719ac6c6ff7508f72c82507b2b2d5a6e7b88ce894933ee24ea73f2bc3c1a4460d12db78877805369def378f7d1d499c498a7a4f50
 AUX drone-1.5.1.initd 1851 BLAKE2B b7b865575537f2c867140451301e7eccf9a49b28025d4e64c22a1d3c121db0438702a5541782355722523cd21dbcb02d464a1d85c0bb48c32b10343be8095977 SHA512 203ddc0bbc7538d1ece8c1db61808b41f86bef338aad49ffaa9d385a85f5c1c5c48cae3a9be0c5b48ddea1ff30e96ec0dca25de66b2359ec0d246eb7f274a8b1
-AUX drone.service 651 BLAKE2B 8c2a44a0a19190e53bc5c3b3a15d827af42b7e4f19931e9553552c6e4be91fe35c61836e51627b2c03effbcd0f2eecc585c341ea7f12be309f6b98a041ac4764 SHA512 15a3a5b0f02cf6da5b83c2417d8718e3bc388a22c46924d08c6df70d945344384b4dcaf87fc0655e6f6ebbf9a3b20790722579e29a9ef7ff515c5857ef5b3cdb
-AUX drone.sh 511 BLAKE2B dee9cb484102f92ad1eec6c63e8a008aa7fb11dbf3594bf8d281fae052f822606c2980c82ad5ff033124f7c6d92c92a16ff895ca371326bc85f33325a9f27916 SHA512 6874cbb4ab3972f8f791d419ad57832187d739da6e11eda81a06273d8235502a03761a7b3ba1aed09689c95e5f1a53826a0dd154c85e3a96dc21cb59b4745740
+AUX drone.service 662 BLAKE2B 32db6b3a5709534e3635dff717ffe4c8612febfd053cdd5fd372a8b6a3fd48afb023839610dcdaed637cf6aa4e5a36dcc0fec452aba3896a04bfdea2d06b4df7 SHA512 2bc4e5c0e503b01f7109de5e487a9b63a528ee2a9d82faf8cbb0f89c1d033f8c2dc85dca70a97039c1989caa980c7b60255f9003ab781d80d660ff5f39821c42
+AUX drone.sh 533 BLAKE2B 71e8cfb50e4a9c52f418745248d0f5e5873b110e6145ec2a5f7157b87303fe57077909f7ad4c05271950c3911d73bde4860d16247f341e87e0967906192fd040 SHA512 b228820aaae573e673cbdba68694cf0194beffa87cb7c91d5c23096d14c2c0761ba48298861f533c9f7a21a9ec60acc204cee82f679225832019773b495fbcbf
 EBUILD drone-1.2.3.ebuild 523 BLAKE2B 20ec727b9488eab0e2c9c7eabc6845ec9705ad3bdfb70803cefc52a4e85ca87f81d9089272c60e3ace8860eb5260e6348aae9f8b719c478e69dca8207d8323bc SHA512 b3ba803d16f6cc8acffcd19c96c993f502551ff0388bf0e5dc6b8c87f7a9389e3da5390de0ec326db617aea96344a46fcb7095bac17280185b61cce06bc6905f
 EBUILD drone-1.5.1.ebuild 523 BLAKE2B 20ec727b9488eab0e2c9c7eabc6845ec9705ad3bdfb70803cefc52a4e85ca87f81d9089272c60e3ace8860eb5260e6348aae9f8b719c478e69dca8207d8323bc SHA512 b3ba803d16f6cc8acffcd19c96c993f502551ff0388bf0e5dc6b8c87f7a9389e3da5390de0ec326db617aea96344a46fcb7095bac17280185b61cce06bc6905f
 EBUILD drone-1.9.1.ebuild 928 BLAKE2B 4f3e750dfd90c7ddbdb3b95170e17ba93b9944e264066b9bf5714a13494ee9e2707de04c1adf5568adc44f52e9c2435cc7587908274f2ab2a96a2cd280d019ac SHA512 fd4eeed82bb2414eedcec9607faa5f566278922161cb751c15a7b13a270cb3d872386b7978e95de962939a3e9a21ba091616d94782c6de4e58ec60c9bb872ad9
diff --git a/dev-util/drone/files/drone.service b/dev-util/drone/files/drone.service
index b656826..a9c142e 100644
--- a/dev-util/drone/files/drone.service
+++ b/dev-util/drone/files/drone.service
@@ -20,13 +20,13 @@ After=postgresql-12.service
 User=drone
 Group=drone
 
-Environment="DRONE_CONFIG_FILE=/etc/drone/app.ini"
+Environment="DOCKER_DRONE_CONFIG_FILE=/etc/drone/app.ini"
 
 ExecStart=drone.sh
 ExecStop=docker container stop drone
 ExecStop=docker container rm drone
 
-Restart=always
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
diff --git a/dev-util/drone/files/drone.sh b/dev-util/drone/files/drone.sh
index e2de059..593bb4b 100755
--- a/dev-util/drone/files/drone.sh
+++ b/dev-util/drone/files/drone.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 # $DRONE_CONFIG_FILE contains path to the config file
 
-if [[ -z "${DRONE_CONFIG_FILE}" ]] ; then
-	echo "DRONE_CONFIG_FILE not set!"
+if [[ -z "${DOCKER_DRONE_CONFIG_FILE}" ]] ; then
+	echo "DOCKER_DRONE_CONFIG_FILE not set!"
 	exit 1
 fi
 
-. "${DRONE_CONFIG_FILE}"
+. "${DOCKER_DRONE_CONFIG_FILE}"
 
 docker_args=""
 
 for var in "${!DRONE_@}" ; do
-	docker_args="${docker_args} --env=${var}=${!var} "
+	docker_args="${docker_args} --env=${var}=${!var}"
 done
 
 for p in ${DOCKER_PUBLISH} ; do
@@ -20,7 +20,7 @@ done
 
 docker run \
   --volume=/var/lib/drone:/data \
-  ${docker_args}
+  ${docker_args} \
   --restart=always \
   --detach=true \
   --name=drone \