From 88501a64ca88f196514432b33f7baab8a798fb35 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 3 Aug 2017 09:00:59 +0200
Subject: swid-gen: Share SWID generator between sw-collector, imc-swima and
 imc-swid

---
 conf/options/imcv.opt         | 9 +++++++++
 conf/options/sw-collector.opt | 9 ---------
 conf/plugins/imc-swid.opt     | 3 ---
 conf/plugins/imc-swima.opt    | 3 ---
 4 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'conf')

diff --git a/conf/options/imcv.opt b/conf/options/imcv.opt
index 33ab74bd5..177781ff7 100644
--- a/conf/options/imcv.opt
+++ b/conf/options/imcv.opt
@@ -21,6 +21,15 @@ charon.imcv.os_info.default_password_enabled = no
 charon.imcv.policy_script = ipsec _imv_policy
 	Script called for each TNC connection to generate IMV policies.
 
+libimcv.swid_gen.command = /usr/local/bin/swid_generator
+	SWID generator command to be executed.
+
+libimcv.swid_gen.tag_creator.name = strongSwan Project
+	Name of the tagCreator entity.
+
+libimcv.swid_gen.tag_creator.regid = strongswan.org
+	regid of the tagCreator entity.
+
 libimcv.debug_level = 1
 	Debug level for a stand-alone _libimcv_ library.
 
diff --git a/conf/options/sw-collector.opt b/conf/options/sw-collector.opt
index 3cd714f51..52baaba73 100644
--- a/conf/options/sw-collector.opt
+++ b/conf/options/sw-collector.opt
@@ -22,14 +22,5 @@ sw-collector.rest_api.uri =
 sw-collector.rest_api.timeout = 120
 	Timeout of REST API HTTP POST transaction.
 
-sw-collector.tag_creator.name = strongSwan Project
-	Name of the tagCreator entity.
-
-sw-collector.tag_creator.regid = strongswan.org
-	regid of the tagCreator entity.
-
-sw-collector.swid_generator = /usr/local/bin/swid_generator
-	SWID generator command to be executed.
-
 sw-collector.load =
 	Plugins to load in sw-collector tool.
diff --git a/conf/plugins/imc-swid.opt b/conf/plugins/imc-swid.opt
index 74490c179..55e0e880e 100644
--- a/conf/plugins/imc-swid.opt
+++ b/conf/plugins/imc-swid.opt
@@ -1,9 +1,6 @@
 libimcv.plugins.imc-swid.swid_directory = ${prefix}/share
 	Directory where SWID tags are located.
 
-libimcv.plugins.imc-swid.swid_generator = /usr/local/bin/swid_generator
-	SWID generator command to be executed.
-
 libimcv.plugins.imc-swid.swid_pretty = FALSE
 	Generate XML-encoded SWID tags with pretty indentation.
 
diff --git a/conf/plugins/imc-swima.opt b/conf/plugins/imc-swima.opt
index 73643f4ba..5dc3411e8 100644
--- a/conf/plugins/imc-swima.opt
+++ b/conf/plugins/imc-swima.opt
@@ -9,9 +9,6 @@ libimcv.plugins.imc-swima.swid_epoch = 0x11223344
 libimcv.plugins.imc-swima.swid_directory = ${prefix}/share
 	Directory where SWID tags are located.
 
-libimcv.plugins.imc-swima.swid_generator = /usr/local/bin/swid_generator
-	SWID generator command to be executed.
-
 libimcv.plugins.imc-swima.swid_pretty = FALSE
 	Generate XML-encoded SWID tags with pretty indentation.
 
-- 
cgit v1.2.3