conf: Descriptions of several settings updated

diff --git a/conf/options/sw-collector.opt b/conf/options/sw-collector.opt
index 52baaba73e5cc66eb9265b8f6bb8dd5db993b5a9..74c320e3536225b5488fa329411ef9a9d30ed19c 100644 (file)
--- a/conf/options/sw-collector.opt
+++ b/conf/options/sw-collector.opt
@@ -4,18 +4,26 @@ sw-collector {}
        Options for the sw-collector tool.
 
 sw-collector.database =
-       Path to software collector database containing event timestamps, software
+       URI to software collector database containing event timestamps, software
        creation and deletion events and collected software identifiers.
 
-sw-collector.history =
-       Path pointing to apt history.log file.
+       URI to software collector database containing event timestamps, software
+       creation and deletion events and collected software identifiers.
+       If it contains a password, make sure to adjust the permissions of the config
+       file accordingly.
 
 sw-collector.first_file = /var/log/bootstrap.log
-       Path pointing to file created when the Linux OS was installed.  
+       Path pointing to file created when the Linux OS was installed.
 
 sw-collector.first_time = 0000-00-00T00:00:00Z
        Time in UTC when the Linux OS was installed.
 
+sw-collector.history =
+       Path pointing to apt history.log file.
+
+sw-collector.tag_creator.regid = strongswan.org
+       regid of the tagCreator entity.
+
 sw-collector.rest_api.uri =
        HTTP URI of the central collector's REST API.
 

diff --git a/conf/plugins/imc-swid.opt b/conf/plugins/imc-swid.opt
index 55e0e880e26fadeaead963ff272d7f19faca65cc..e622aa683eba2a86bb13b761547d1f87a8b3a16c 100644 (file)
--- a/conf/plugins/imc-swid.opt
+++ b/conf/plugins/imc-swid.opt
@@ -1,8 +1,8 @@
 libimcv.plugins.imc-swid.swid_directory = ${prefix}/share
        Directory where SWID tags are located.
 
-libimcv.plugins.imc-swid.swid_pretty = FALSE
+libimcv.plugins.imc-swid.swid_pretty = no
        Generate XML-encoded SWID tags with pretty indentation.
 
-libimcv.plugins.imc-swid.swid_full = FALSE
+libimcv.plugins.imc-swid.swid_full = no
        Include file information in the XML-encoded SWID tags.

diff --git a/conf/plugins/imc-swima.opt b/conf/plugins/imc-swima.opt
index 5dc3411e84f693fb44cd8d7d65f4891a0e58f15a..099a3c80f653534004d54628569cb548ae3f4400 100644 (file)
--- a/conf/plugins/imc-swima.opt
+++ b/conf/plugins/imc-swima.opt
@@ -1,16 +1,21 @@
+libimcv.plugins.imc-swima.eid_epoch = 0x11223344
+       Set 32 bit epoch value for event IDs manually if software collector database
+       is not available.
+
 libimcv.plugins.imc-swima.swid_database =
-       Path to software collector database containing event timestamps, software
+       URI to software collector database containing event timestamps, software
        creation and deletion events and collected software identifiers.
 
-libimcv.plugins.imc-swima.swid_epoch = 0x11223344
-       Set 32 bit epoch value for event IDs manually if software collector database
-       is not available.
+       URI to software collector database containing event timestamps, software
+       creation and deletion events and collected software identifiers.
+       If it contains a password, make sure to adjust the permissions of the config
+       file accordingly.
 
 libimcv.plugins.imc-swima.swid_directory = ${prefix}/share
        Directory where SWID tags are located.
 
-libimcv.plugins.imc-swima.swid_pretty = FALSE
+libimcv.plugins.imc-swima.swid_pretty = no
        Generate XML-encoded SWID tags with pretty indentation.
 
-libimcv.plugins.imc-swima.swid_full = FALSE
+libimcv.plugins.imc-swima.swid_full = no
        Include file information in the XML-encoded SWID tags.