Use better defaults for for ospd-openvas settings

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # default reviewers
-*                 @jjnicola @bjoernricks
+*                 @greenbone/scanner-maintainers

CHANGELOG.md

@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Added
 ### Changed
+- Use better defaults for for ospd-openvas settings [#454](https://github.com/greenbone/ospd-openvas/pull/454)
+
 ### Deprecated
 ### Removed
 ### Fixed

config/ospd-openvas.conf

@@ -0,0 +1,7 @@
+[OSPD - openvas]
+log_level = INFO
+socket_mode = 0o770
+unix_socket = /run/ospd/ospd-openvas.sock
+pid_file = /run/ospd/ospd-openvas.pid
+log_file = /var/log/gvm/ospd-openvas.log
+lock_file_dir = /var/lib/openvas

config/ospd-openvas.service

@@ -1,21 +1,19 @@
 [Unit]
-Description=OpenVAS Wrapper of the Greenbone Vulnerability Management (ospd-openvas)
+Description=OSPd Wrapper for the OpenVAS Scanner (ospd-openvas)
 Documentation=man:ospd-openvas(8) man:openvas(8)
 After=network.target networking.service redis-server@openvas.service
 Wants=redis-server@openvas.service
 ConditionKernelCommandLine=!recovery
 
 [Service]
 Type=forking
-EnvironmentFile=<install-prefix>/etc/default/ospd-openvas.default
-Environment="PATH=$PATH"
-Environment="PYTHONPATH=$PYTHONPATH"
-User=$OSPD_OPENVAS_USER
-Group=$OSPD_OPENVAS_GROUP
-PIDFile=$OSPD_OPENVAS_PID
-ExecStart=<install-prefix>/bin/ospd-openvas $OSPD_OPENVAS_ARGS
+User=gvm
+Group=gvm
+RuntimeDirectory=ospd
+RuntimeDirectoryMode=2775
+PIDFile=/run/ospd/ospd-openvas.pid
+ExecStart=/usr/local/bin/ospd-openvas --config /etc/gvm/ospd-openvas.conf --log-config /etc/gvm/ospd-logging.conf
 SuccessExitStatus=SIGKILL
-# This works asynchronously, but does not take the daemon down during the reload so it's ok.
 Restart=always
 RestartSec=60
 

ospd_openvas/daemon.py

@@ -438,7 +438,7 @@ class OSPDopenvas(OSPDaemon):
     """ Class for ospd-openvas daemon. """
 
     def __init__(
-        self, *, niceness=None, lock_file_dir='/var/run/ospd', **kwargs
+        self, *, niceness=None, lock_file_dir='/var/lib/openvas', **kwargs
     ):
         """ Initializes the ospd-openvas daemon's internal data. """
         self.main_db = MainDB()

pyproject.toml

@@ -32,9 +32,8 @@ keywords = [
 packages = [
   { include = "ospd_openvas"},
   { include = "docs/ospd-openvas.8", format = "sdist"},
-  { include = "config/ospd-openvas.default", format = "sdist"},
   { include = "config/ospd-openvas.service", format = "sdist"},
-  { include = "config/ospd.conf", format = "sdist"},
+  { include = "config/ospd-openvas.conf", format = "sdist"},
   { include = "tests", format = "sdist" },
   { include = "CHANGELOG.md", format = "sdist"},
   { include = "COPYING", format = "sdist"},