6 files changed, 121 insertions, 84 deletions
diff --git a/dev-util/drone/files/drone-agent.confd b/dev-util/drone/files/drone-agent.confd
deleted file mode 100644
index bfe82b16c756..000000000000
--- a/dev-util/drone/files/drone-agent.confd
+++ /dev/null
@@ -1,19 +0,0 @@
-# arguments for drone-agent
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SERVER=
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_BACKOFF=15s
-#DRONE_TIMEOUT=15m
-#DRONE_MAX_LOGS=5
-#DRONE_PLUGIN_PULL=true
-#DRONE_PLUGIN_PRIVILEGED
-#DOCKER_HOST
-#DOCKER_TLS_VERIFY
-#DOCKER_CERT_PATH
-#DOCKER_MAX_PROCS=2
-#DOCKER_OS=linux
-#DOCKER_ARCH=amd64
-#HTTP_PROXY=
-#HTTPS_PROXY=
-#NO_PROXY=
diff --git a/dev-util/drone/files/drone-agent.initd b/dev-util/drone/files/drone-agent.initd
deleted file mode 100644
index d14b11f80d33..000000000000
--- a/dev-util/drone/files/drone-agent.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI Agent"
-pidfile=${pidfile:-"/run/drone/${SVCNAME}.pid"}
-user=${user:-drone}
-group=${group:-drone}
-
-command="/usr/bin/drone-agent"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/drone/${SVCNAME}.log \
-	--stderr /var/log/drone/${SVCNAME}.log"
diff --git a/dev-util/drone/files/drone-server.conf b/dev-util/drone/files/drone-server.conf
new file mode 100644
index 000000000000..ab17fe08e3fe
--- /dev/null
+++ b/dev-util/drone/files/drone-server.conf
@@ -0,0 +1,81 @@
+# environment variables for drone
+# See also http://docs.drone.io/server/reference/
+# DRONE_BITBUCKET_CLIENT_ID=
+# DRONE_BITBUCKET_SECRET=
+# DRONE_BITBUCKET_DEBUG=
+# DRONE_CLEANUP_DEADLINE_PENDING=
+# DRONE_CLEANUP_DEADLINE_RUNNING=
+# DRONE_CLEANUP_DISABLED=
+# DRONE_CLEANUP_INTERVAL=
+# DRONE_CONVERT_PLUGIN_ENDPOINT=
+# DRONE_CONVERT_PLUGIN_EXTENSION=
+# DRONE_CONVERT_PLUGIN_SECRET=
+# DRONE_CONVERT_PLUGIN_SKIP_VERIFY=
+# DRONE_COOKIE_SECRET=
+# DRONE_COOKIE_TIMEOUT=
+# DRONE_CRON_DISABLED=
+# DRONE_CRON_INTERVAL=
+DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
+# DRONE_DATABASE_DRIVER=sqlite3
+# DRONE_DATABASE_MAX_CONNECTIONS=
+# DRONE_DATABASE_SECRET=
+# DRONE_GIT_ALWAYS_AUTH=
+# DRONE_GIT_PASSWORD=
+# DRONE_GIT_USERNAME=
+# DRONE_GITEA_CLIENT_ID=
+# DRONE_GITEA_CLIENT_SECRET=
+# DRONE_GITEA_SERVER=
+# DRONE_GITEA_SKIP_VERIFY=
+# DRONE_GITEE_REDIRECT_URL=
+# DRONE_GITEE_SCOPE=
+# DRONE_GITEE_SKIP_VERIFY=
+# DRONE_GITHUB_CLIENT_ID=
+# DRONE_GITHUB_CLIENT_SECRET=
+# DRONE_GITHUB_SCOPE=
+# DRONE_GITHUB_SERVER=
+# DRONE_GITHUB_SKIP_VERIFY=false
+# DRONE_GITLAB_CLIENT_ID=
+# DRONE_GITLAB_CLIENT_SECRET=
+# DRONE_GITLAB_SERVER=
+# DRONE_GITLAB_SKIP_VERIFY=false
+# DRONE_GOGS_SERVER=
+# DRONE_GOGS_SKIP_VERIFY=false
+# DRONE_JSONNET_ENABLED=
+# DRONE_LICENSE=
+# DRONE_LOGS_COLOR=
+# DRONE_LOGS_DEBUG=
+# DRONE_LOGS_PRETTY=
+# DRONE_LOGS_TEXT=
+# DRONE_LOGS_TRACE=
+# DRONE_PROMETHEUS_ANONYMOUS_ACCESS=
+# DRONE_REGISTRATION_CLOSED=
+# DRONE_REPOSITORY_FILTER=
+# DRONE_RPC_SECRET=
+# DRONE_S3_BUCKET=
+# DRONE_S3_ENDPOINT=
+# DRONE_S3_PATH_STYLE=
+# DRONE_S3_PREFIX=
+# DRONE_SERVER_HOST=
+# DRONE_SERVER_PROTO=
+# DRONE_SERVER_PROXY_HOST=
+# DRONE_SERVER_PROXY_PROTO=
+# DRONE_STARTUP_ENABLED=
+# DRONE_STARTUP_STEP_LIMIT=
+# DRONE_STASH_CONSUMER_KEY=
+# DRONE_STASH_PRIVATE_KEY=
+# DRONE_STASH_SERVER=
+# DRONE_STASH_SKIP_VERIFY=
+# DRONE_STATUS_DISABLED=
+# DRONE_STATUS_NAME=
+# DRONE_TLS_AUTOCERT=
+# DRONE_TLS_CERT=
+# DRONE_TLS_KEY=
+# DRONE_USER_CREATE=
+# DRONE_USER_FILTER=
+# DRONE_VALIDATE_PLUGIN_ENDPOINT=
+# DRONE_VALIDATE_PLUGIN_SECRET=
+# DRONE_VALIDATE_PLUGIN_SKIP_VERIFY=
+# DRONE_WEBHOOK_ENDPOINT=
+# DRONE_WEBHOOK_EVENTS=
+# DRONE_WEBHOOK_SECRET=
+# DRONE_WEBHOOK_SKIP_VERIFY=
diff --git a/dev-util/drone/files/drone-server.confd b/dev-util/drone/files/drone-server.confd
deleted file mode 100644
index 3d4fd461402d..000000000000
--- a/dev-util/drone/files/drone-server.confd
+++ /dev/null
@@ -1,47 +0,0 @@
-# arguments for drone
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_SERVER_CERT=
-#DRONE_SERVER_KEY=
-#DRONE_ADMIN=
-#DRONE_ORGS=
-#DRONE_OPEN=false
-#DRONE_YAML=.drone.yml
-#DRONE_CACHE_TTY=15m
-DRONE_DATABASE_DRIVER=sqlite3
-DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
-DRONE_GITHUB=true
-#DRONE_GITHUB_URL=https://github.com
-#DRONE_GITHUB_CLIENT=
-#DRONE_GITHUB_SECRET=
-#DRONE_GITHUB_SCOPE=
-#DRONE_GITHUB_GIT_USERNAME=
-#DRONE_GITHUB_GIT_PASSWORD=
-#DRONE_GITHUB_PRIVATE_MODE=false
-#DRONE_GITHUB_MERGE_REF=true
-#DRONE_GITHUB_CONTEXT=continuous-integration/drone
-#DRONE_GITHUB_SKIP_VERIFY=false
-#DRONE_GOGS=false
-#DRONE_GOGS_URL=
-#DRONE_GOGS_GIT_USERNAME=
-#DRONE_GOGS_GIT_PASSWORD=
-#DRONE_GOGS_PRIVATE_MODE=
-#DRONE_GOGS_SKIP_VERIFY=false
-#DRONE_BITBUCKET=false
-#DRONE_BITBUCKET_CLIENT=
-#DRONE_BITBUCKET_SECRET=
-#DRONE_STASH=false
-#DRONE_STASH_URL=
-#DRONE_STASH_CONSUMER_KEY=
-#DRONE_STASH_CONSUMER_RSA=
-#DRONE_STASH_GIT_USERNAME=
-#DRONE_STASH_GIT_PASSWORD=
-#DRONE_GITLAB=false
-#DRONE_GITLAB_URL=https://gitlab.com
-#DRONE_GITLAB_CLIENT=
-#DRONE_GITLAB_SECRET=
-#DRONE_GITLAB_GIT_USERNAME=
-#DRONE_GITLAB_GIT_PASSWORD=
-#DRONE_GITLAB_SKIP_VERIFY=false
-#DRONE_GITLAB_PRIVATE_MODE=false
diff --git a/dev-util/drone/files/drone-server.initd b/dev-util/drone/files/drone-server.initd
index fe87c713db9e..4294ef9b74dc 100644
--- a/dev-util/drone/files/drone-server.initd
+++ b/dev-util/drone/files/drone-server.initd
@@ -3,12 +3,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Drone CI"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"}
 user=${user:-drone}
 group=${group:-drone}
 
 command="/usr/bin/drone-server"
 command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+command_args="-env-file /etc/${RC_SVCNAME}.conf"
+start_stop_daemon_args="
+	--user ${user}
+	--group ${group}
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+	"
+
+start_pre() {
+	[ -e /etc/${RC_SVCNAME}.conf ] && return
+	eerror "You need to create /etc/${RC_SVCNAME}.conf"
+	eerror "See http://docs.drone.io/server/reference/ for information."
+	return 1
+}
diff --git a/dev-util/drone/files/drone-server.service b/dev-util/drone/files/drone-server.service
new file mode 100644
index 000000000000..53f019a6a8bf
--- /dev/null
+++ b/dev-util/drone/files/drone-server.service
@@ -0,0 +1,25 @@
+[Unit]
+Description=Drone CI
+Documentation=https://docs.drone.io/
+
+After=mysqld.target
+After=network.target
+After=postgresql-9.6.service
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
+Requires=network.target
+
+[Service]
+User=drone
+Group=drone
+
+EnvironmentFile=/etc/drone-server.conf
+ExecStart=/usr/bin/drone-server
+
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target