[openvas-manager] migrate from sysv init scripts to systemd

rebus rebus at fedoraproject.org
Tue Apr 10 02:04:02 UTC 2012


commit 61d79455037999576725af2dcafe2d418693dab8
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Tue Apr 10 04:02:14 2012 +0200

    migrate from sysv init scripts to systemd

 openvas-manager.initd     |   16 +++++-----------
 openvas-manager.service   |   18 ++++++++++++++++++
 openvas-manager.sysconfig |   13 +++++++------
 3 files changed, 30 insertions(+), 17 deletions(-)
---
diff --git a/openvas-manager.initd b/openvas-manager.initd
index ceeb305..9536dde 100644
--- a/openvas-manager.initd
+++ b/openvas-manager.initd
@@ -49,17 +49,11 @@ rh_status_q() {
 start() {
 
 	# Build parameters
-	[ -n "$MANAGER_LISTEN" ] && PARAMS="$PARAMS --listen=$MANAGER_LISTEN"
-	[ -n "$MANAGER_PORT" ]   && PARAMS="$PARAMS --port=$MANAGER_PORT"
-	[ -n "$SCANNER_LISTEN" ] && PARAMS="$PARAMS --slisten=$SCANNER_LISTEN"
-	[ -n "$SCANNER_PORT" ]   && PARAMS="$PARAMS --sport=$SCANNER_PORT"
-
-	case "$MANAGER_OTP" in 
-		yes|YES|true|TRUE)
-			PARAMS="$PARAMS --otp"
-			;;
-	esac
-
+	[ -n "$MANAGER_LISTEN" ] && PARAMS="$PARAMS $MANAGER_LISTEN"
+	[ -n "$MANAGER_PORT" ]   && PARAMS="$PARAMS $MANAGER_PORT"
+	[ -n "$SCANNER_LISTEN" ] && PARAMS="$PARAMS $SCANNER_LISTEN"
+	[ -n "$SCANNER_PORT" ]   && PARAMS="$PARAMS $SCANNER_PORT"
+	[ -n "$MANAGER_OTP" ]    && PARAMS="$PARAMS $MANAGER_OTP"
 
 
         if [ ! -f "$CACERT" ]; then
diff --git a/openvas-manager.service b/openvas-manager.service
new file mode 100644
index 0000000..79b4e6d
--- /dev/null
+++ b/openvas-manager.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=OpenVAS Manager
+After=network.target
+After=openvas-scanner.service
+Before=openvas-administrator.service
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/sysconfig/openvas-manager
+ExecStart=/usr/sbin/openvasmd $MANAGER_LISTEN $MANAGER_PORT $SCANNER_LISTEN $SCANNER_PORT $MANAGER_OTP
+Restart=always
+RestartSec=1
+User=root
+Group=root
+TimeoutSec=1200
+
+[Install]
+WantedBy=multi-user.target
diff --git a/openvas-manager.sysconfig b/openvas-manager.sysconfig
index a9a8829..d294159 100644
--- a/openvas-manager.sysconfig
+++ b/openvas-manager.sysconfig
@@ -1,15 +1,16 @@
 #Manager listens on given address - by default manager listens on all addresses
-#MANAGER_LISTEN=127.0.0.1
+#MANAGER_LISTEN=--listen=127.0.0.1
 
 #Manager listens on given port - by default 9390
-MANAGER_PORT=9390
+MANAGER_PORT=--port=9390
 
 #Enable Manager to server OTP too
-MANAGER_OTP=yes
+MANAGER_OTP=--otp
 
 #Contact scanner on given address
-SCANNER_LISTEN=127.0.0.1
+SCANNER_LISTEN=--slisten=127.0.0.1
+
+#Scanner listens on given port - by default 9391
+SCANNER_PORT=--sport=9391
 
-#Scanner listens on given port - by default 9390
-SCANNER_PORT=9391
 


More information about the scm-commits mailing list