From b50a106327a4d4480b77038c14fca3aaa9c1c543 Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Fri, 15 May 2020 08:37:33 +0000
Subject: [PATCH] community/ospd-openvas: improved init to set and use
correctly pidfile
---
community/ospd-openvas/APKBUILD | 6 +++---
community/ospd-openvas/ospd-openvas.initd | 8 +++-----
community/ospd-openvas/ospd.conf | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/community/ospd-openvas/APKBUILD b/community/ospd-openvas/APKBUILD
index 2f97307a20d6..49e8b7a4e3a7 100644
--- a/community/ospd-openvas/APKBUILD
+++ b/community/ospd-openvas/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=ospd-openvas
pkgver=1.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="ospd-openvas is an OSP server implementation to allow GVM to remotely control an OpenVAS Scanner"
url="https://github.com/greenbone/ospd-openvas"
arch="noarch"
@@ -29,6 +29,6 @@ package() {
}
sha512sums="bdcdb1a8bc08fc27f1a85846ad944b3764a67c153cd75ffa607f69e0c07f223aa0e0965ee081e2398d4d47fc6faf1fd6fad90e6bc724952a0679de783dd2cc87 ospd-openvas-1.0.1.tar.gz
-7978af16912fcdc3f42145e9736f2768eda8b1214463dc6839eb1f6d67805bcf4267943334b0b05e5be8ec1645bad2b0fdab88dc6038f47d1b75e23bb15abcdf ospd-openvas.initd
+af576db115f85e80d7e2e8a91508c0ce70e911002ab97ccd4ebb089c487b515ca393ae9fd284ecc9d3f533a2ab4a741faa1dcc4f2047b7f1ca541832ce8b6b09 ospd-openvas.initd
ef07f02c3900ee431785b2c2e53f04f4fd114f502526ec509c869dcd3a95e4284fc65f05f5ec85280cc05a29a46fba9c74ef3b0b0d618b9c9c1e62d9bb3fc6fa ospd-openvas.confd
-12c9aad78ec0244ff1575563f73fbb8e1def08d5fa71bf69a105a491e6cdb47d1868833168b35d903bb2a94e5e81c32601118130ebdfb8c596721a3c9f3ccabd ospd.conf"
+cca4e7d9d0ed299e43d748337c8a848056c9125bb3fea32d42409f50852422cc8409388c7b5e275e3d4b78d6f86f11c64adddaa9e3dd622bbf9e09579f4ea3be ospd.conf"
diff --git a/community/ospd-openvas/ospd-openvas.initd b/community/ospd-openvas/ospd-openvas.initd
index f7a67ba99a5a..bfc70984d825 100644
--- a/community/ospd-openvas/ospd-openvas.initd
+++ b/community/ospd-openvas/ospd-openvas.initd
@@ -1,18 +1,16 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-name="remotely control an OpenVAS Scanner"
+name="Remotely control an OpenVAS Scanner"
command="/usr/bin/ospd-openvas"
-pidfile="/run/${RC_SVCNAME}.pid"
+pidfile="/run/ospd/${RC_SVCNAME}.pid"
command_args="${OSPD_OPENVAS_OPTIONS} \
${OSPD_OPENVAS_UNIX_SOCKET} \
${OSPD_OPENVAS_SOCKET_MODE} \
--pid-file ${pidfile} \
--config /etc/openvas/ospd.conf"
-command_background="true"
-
depend() {
after bootmisc
need localmount redis
diff --git a/community/ospd-openvas/ospd.conf b/community/ospd-openvas/ospd.conf
index 26a9bff6718a..3f155aa40237 100644
--- a/community/ospd-openvas/ospd.conf
+++ b/community/ospd-openvas/ospd.conf
@@ -4,7 +4,7 @@
unix_socket = /tmp/ospd.sock
#socket_mode = 0o770
-#unix_socket = /run/ospd/ospd-openvas.pid
+pid_file = /run/ospd/ospd-openvas.pid
log_level = DEBUG
log_file = /var/log/gvm/openvas.log
--
GitLab