Author: jan
Date: 2018-02-04 16:53:49 +0100 (Sun, 04 Feb 2018)
New Revision: 30065
Modified:
trunk/ospd/ChangeLog
trunk/ospd/INSTALL
trunk/ospd/README
trunk/ospd/doc/HTML.xsl
trunk/ospd/doc/generate
trunk/ospd/ospd/misc.py
trunk/ospd/setup.py
Log:
* INSTALL, README, doc/HTML.xsl, doc/generate, ospd/misc.py, setup.py:
Update to reflect name changes: OpenVAS Manager to Greenbone
Vulnerability Manager, openvasmd to gvmd, OMP to GMP.
Modified: trunk/ospd/ChangeLog
===================================================================
--- trunk/ospd/ChangeLog 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/ChangeLog 2018-02-04 15:53:49 UTC (rev 30065)
@@ -1,3 +1,9 @@
+2018-02-04 Jan-Oliver Wagner <jan-oliver.wag...@greenbone.net>
+
+ * INSTALL, README, doc/HTML.xsl, doc/generate, ospd/misc.py, setup.py:
+ Update to reflect name changes: OpenVAS Manager to Greenbone
+ Vulnerability Manager, openvasmd to gvmd, OMP to GMP.
+
2016-12-09 Jan-Oliver Wagner <jan-oliver.wag...@greenbone.net>
* ospd/ospd.py: Add a todo for a future change.
Modified: trunk/ospd/INSTALL
===================================================================
--- trunk/ospd/INSTALL 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/INSTALL 2018-02-04 15:53:49 UTC (rev 30065)
@@ -62,46 +62,47 @@
In case you do not have already a certificate to use, you may quickly
create your own one (can be used for multiple ospd daemons):
-$ openvas-manage-certs.sh -s
+$ gvm-manage-certs.sh -s
And sign it with the CA checked for by the client. The client is usually
-OpenVAS Manager for which a global trusted CA certficate can be configured.
+Greenbone Vulnerability Manager for which a global trusted CA certficate
+can be configured.
-Registering a OSP daemon at OpenVAS Manager
--------------------------------------------
+Registering a OSP daemon at Greenbone Vulnerability Manager
+-----------------------------------------------------------
The file README explains how to control a OSP daemon via command line.
-It is also possible to register a OSP daemon at the OpenVAS Manager
-and then use OMP clients to control the OSP daemon, for example the
+It is also possible to register a OSP daemon at the Greenbone Vulnerability
+Manager and then use GMP clients to control the OSP daemon, for example the
web interface GSA.
You can register either via the GUI (Configuration->Scanners) and create
a new Scanner there.
-Or you can create a scanner via openvasmd command line (adjust host,
+Or you can create a scanner via gvmd command line (adjust host,
port, paths etc. for your daemon):
-$ openvasmd --create-scanner="OSP Scanner-Name" --scanner-host=127.0.0.1
--scanner-port=1234 \
- --scanner-type="OSP"
--scanner-ca-pub=/usr/var/lib/openvas/CA/cacert.pem \
- --scanner-key-pub=/usr/var/lib/openvas/CA/clientcert.pem \
- --scanner-key-priv=/usr/var/lib/openvas/private/CA/clientkey.pem
+$ gvmd --create-scanner="OSP Scanner-Name" --scanner-host=127.0.0.1
--scanner-port=1234 \
+ --scanner-type="OSP" --scanner-ca-pub=/usr/var/lib/gvm/CA/cacert.pem \
+ --scanner-key-pub=/usr/var/lib/gvm/CA/clientcert.pem \
+ --scanner-key-priv=/usr/var/lib/gvm/private/CA/clientkey.pem
-In case the OSP daemon runs on the same system as openvasmd and uses a unix
domain socket:
+In case the OSP daemon runs on the same system as gvmd and uses a unix domain
socket:
-$ openvasmd --create-scanner="OSP Scanner-Name" --scanner-type="OSP"
--scanner-host=/my/path/to/socket
+$ gvmd --create-scanner="OSP Scanner-Name" --scanner-type="OSP"
--scanner-host=/my/path/to/socket
-Check whether OpenVAS Manager can connect to the OSP daemon (needs to run of
course):
+Check whether Greenbone Vulnerbility Manager can connect to the OSP daemon
(needs to run of course):
-$ openvasmd --get-scanners
+$ gvmd --get-scanners
08b69003-5fc2-4037-a479-93b440211c73 OpenVAS Default
3566ddf1-cecf-4491-8bcc-5d62a87404c3 OSP Scanner-Name
-$ openvasmd --verify-scanner=3566ddf1-cecf-4491-8bcc-5d62a87404c3
+$ gvmd --verify-scanner=3566ddf1-cecf-4491-8bcc-5d62a87404c3
Scanner version: 1.0.
-Of course, using OMP via command line tool "omp" to register a
+Of course, using GMP via command line tool of "gvm-tools" to register a
OSP Scanner is also possible as a third option.
Modified: trunk/ospd/README
===================================================================
--- trunk/ospd/README 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/README 2018-02-04 15:53:49 UTC (rev 30065)
@@ -4,9 +4,9 @@
OSPD is a base class for scanner wrappers which share the same communication
protocol: OSP (Open Scanner Protocol). OSP creates a unified interface for
different security scanners and make their control flow and scan results
-consistently available under the central OpenVAS Manager service.
+consistently available under the central Greenbone Vulnerability Manager
service.
-OSP is similar in many ways to OMP (OpenVAS Management Protocol): XML-based,
+OSP is similar in many ways to GMP (Greenbone Management Protocol): XML-based,
stateless and non-permanent connection.
The design supports wrapping arbitrary scanners with same protocol OSP,
@@ -28,8 +28,8 @@
full wrapper.
See the file INSTALL about how to register a OSP scanner at
-the OpenVAS Manager which will automatically establish a full GUI
-integration for the Greenbone Security Assistant (GSA).
+the Greenbone Vulnerability Manager which will automatically establish a full
+GUI integration for the Greenbone Security Assistant (GSA).
There are some online resources about this topic:
http://docs.greenbone.net/GSM-Manual/gos-3.1/en/osp.html#how-to-write-your-own-osp-wrapper
Modified: trunk/ospd/doc/HTML.xsl
===================================================================
--- trunk/ospd/doc/HTML.xsl 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/doc/HTML.xsl 2018-02-04 15:53:49 UTC (rev 30065)
@@ -14,7 +14,7 @@
<!--
OSPD
$Id$
-Description: OpenVAS Scan Protocol (OSP) single page HTML doc generator.
+Description: Open Scanner Protocol (OSP) single page HTML doc generator.
Authors:
Hani Benhabiles <hani.benhabi...@greenbone.net>
Modified: trunk/ospd/doc/generate
===================================================================
--- trunk/ospd/doc/generate 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/doc/generate 2018-02-04 15:53:49 UTC (rev 30065)
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# OpenVAS
+# GVM
# $Id$
# Description: Schema generator script: HTML.
#
Modified: trunk/ospd/ospd/misc.py
===================================================================
--- trunk/ospd/ospd/misc.py 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/ospd/misc.py 2018-02-04 15:53:49 UTC (rev 30065)
@@ -47,9 +47,9 @@
LOGGER = logging.getLogger(__name__)
# Default file locations as used by a OpenVAS default installation
-KEY_FILE = "/usr/var/lib/openvas/private/CA/serverkey.pem"
-CERT_FILE = "/usr/var/lib/openvas/CA/servercert.pem"
-CA_FILE = "/usr/var/lib/openvas/CA/cacert.pem"
+KEY_FILE = "/usr/var/lib/gvm/private/CA/serverkey.pem"
+CERT_FILE = "/usr/var/lib/gvm/CA/servercert.pem"
+CA_FILE = "/usr/var/lib/gvm/CA/cacert.pem"
PORT = 1234
ADDRESS = "0.0.0.0"
Modified: trunk/ospd/setup.py
===================================================================
--- trunk/ospd/setup.py 2018-01-29 07:21:29 UTC (rev 30064)
+++ trunk/ospd/setup.py 2018-02-04 15:53:49 UTC (rev 30065)
@@ -51,8 +51,8 @@
url='http://www.openvas.org',
# Author
- author='OpenVAS Development Team',
- author_email='i...@openvas.org',
+ author='Greenbone Networks GmbH',
+ author_email='i...@greenbone.net',
# License
license='GPLv2+',
@@ -78,7 +78,7 @@
],
# What does your project relate to?
- keywords=['OpenVAS OSP'],
+ keywords=['Greenbone Vulnerbility Manager OSP'],
# List run-time dependencies here. These will be installed by pip when your
# project is installed. For an analysis of "install_requires" vs pip's
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
