jlec 14/10/01 10:58:58
Modified: openvasmd.service openvasmd.init
openvasmd-daemon.conf
Added: openvas-manager-5.0.4-run.patch
Log:
net-analyzer/openvas-manager: Enhance init and systemd support; drop
installation instructions in favour of meta package
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key B9D4F231BD1558AB!)
Revision Changes Path
1.2 net-analyzer/openvas-manager/files/openvasmd.service
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.service?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.service?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.service?r1=1.1&r2=1.2
Index: openvasmd.service
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvasmd.service 28 Sep 2014 18:23:17 -0000 1.1
+++ openvasmd.service 1 Oct 2014 10:58:58 -0000 1.2
@@ -5,7 +5,7 @@
[Service]
EnvironmentFile=-/etc/openvas/openvasmd.conf
-ExecStart=/usr/sbin/openvasmd -f $MANAGER_LISTEN $MANAGER_PORT $SCANNER_LISTEN
$SCANNER_PORT $MANAGER_OTP
+ExecStart=/usr/sbin/openvasmd -f ${MANAGER_LISTEN} ${MANAGER_PORT}
${SCANNER_LISTEN} ${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}
Restart=always
RestartSec=1
User=root
1.2 net-analyzer/openvas-manager/files/openvasmd.init
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.init?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.init?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.init?r1=1.1&r2=1.2
Index: openvasmd.init
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvasmd.init 28 Sep 2014 18:23:17 -0000 1.1
+++ openvasmd.init 1 Oct 2014 10:58:58 -0000 1.2
@@ -5,8 +5,14 @@
name="OpenVAS Manager"
command=/usr/sbin/openvasmd
-command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN}
${SCANNER_PORT} ${MANAGER_OTP}"
+command_args="${MANAGER_LISTEN} ${MANAGER_PORT} ${SCANNER_LISTEN}
${SCANNER_PORT} ${MANAGER_EXTRA_ARGS}"
+pidfile="/run/openvasmd.pid"
depend() {
- need net openvassd
+ after bootmisc
+ need localmount net
+}
+
+start_pre() {
+ checkpath --directory --mode 0775 --quiet /var/cache/openvas
}
1.2 net-analyzer/openvas-manager/files/openvasmd-daemon.conf
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd-daemon.conf?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd-daemon.conf?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd-daemon.conf?r1=1.1&r2=1.2
Index: openvasmd-daemon.conf
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/openvas-manager/files/openvasmd-daemon.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openvasmd-daemon.conf 28 Sep 2014 18:23:17 -0000 1.1
+++ openvasmd-daemon.conf 1 Oct 2014 10:58:58 -0000 1.2
@@ -4,8 +4,7 @@
#Manager listens on given port - by default 9390
MANAGER_PORT=--port=9390
-#Enable Manager to server OTP too
-MANAGER_OTP=--otp
+MANAGER_EXTRA_ARGS=""
#Contact scanner on given address
SCANNER_LISTEN=--slisten=127.0.0.1
1.1
net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/openvas-manager/files/openvas-manager-5.0.4-run.patch?rev=1.1&content-type=text/plain
Index: openvas-manager-5.0.4-run.patch
===================================================================
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80f5bd2..33f0562 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,7 +161,7 @@ endif (NOT INCLUDEDIR)
set (OPENVAS_DATA_DIR "${DATADIR}/openvas")
set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas")
-set (OPENVAS_PID_DIR "${LOCALSTATEDIR}/run")
+set (OPENVAS_PID_DIR "/run")
set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
set (OPENVAS_SCAP_RES_DIR "${OPENVAS_DATA_DIR}/scap")
set (OPENVAS_SCAP_DATA_DIR "${OPENVAS_STATE_DIR}/scap-data")
