XMLRPC / HA-Sync: add services keyword (introduced opnsense/core#4834)…

… in xmlrpc templates for existing plugins. (cherry picked from commit f557e2b) (cherry picked from commit 00cab9b) (cherry picked from commit 648b183) (cherry picked from commit 6cca3be)
shimco · Mar 29, 2021 · 3589a77 · 3589a77
1 parent a11767c
commit 3589a77
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 8 deletions.
diff --git a/dns/bind/Makefile b/dns/bind/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		bind
 PLUGIN_VERSION=		1.16
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		BIND domain name service
 PLUGIN_DEPENDS=		bind916
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/dns/bind/src/etc/inc/plugins.inc.d/bind.inc b/dns/bind/src/etc/inc/plugins.inc.d/bind.inc
@@ -60,5 +60,6 @@ function bind_xmlrpc_sync()
     $result['id'] = 'bind';
     $result['section'] = 'OPNsense.bind';
     $result['description'] = gettext('BIND domain name service');
+    $result['services'] = ['named'];
     return array($result);
 }
diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		zabbix-agent
 PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		Zabbix monitoring agent
 PLUGIN_DEPENDS=		zabbix5-agent
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc b/net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc
@@ -82,5 +82,6 @@ function zabbixagent_xmlrpc_sync()
     $result['id'] = 'zabbixagent';
     $result['section'] = 'OPNsense.zabbixagent.settings';
     $result['description'] = gettext('Zabbix monitoring agent');
+    $result['services'] = ['zabbix_agentd'];
     return array($result);
 }
diff --git a/net/frr/Makefile b/net/frr/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		frr
 PLUGIN_VERSION=		1.21
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net/frr/src/etc/inc/plugins.inc.d/frr.inc b/net/frr/src/etc/inc/plugins.inc.d/frr.inc
@@ -142,5 +142,6 @@ function frr_xmlrpc_sync()
     $result['id'] = 'quagga';
     $result['section'] = 'OPNsense.quagga';
     $result['description'] = gettext('FRR');
+    $result['services'] = ['frr'];
     return array($result);
 }
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		relayd
 PLUGIN_VERSION=		2.4
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		relayd
 PLUGIN_COMMENT=		Relayd Load Balancer
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
@@ -73,6 +73,7 @@ function relayd_xmlrpc_sync()
     $result[] = array(
         'description' => gettext('Relayd Load Balancer'),
         'section' => 'OPNsense.relayd',
+        'services' => ['relayd'],
         /* kept for backwards compat: */
         'id' => 'lb',
     );

diff --git a/net/tayga/Makefile b/net/tayga/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		tayga
 PLUGIN_VERSION=		1.1
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		Tayga NAT64
 PLUGIN_DEPENDS=		tayga
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc b/net/tayga/src/etc/inc/plugins.inc.d/tayga.inc
@@ -59,6 +59,7 @@ function tayga_xmlrpc_sync()
     $result['id'] = 'taygavpn';
     $result['section'] = 'OPNsense.tayga';
     $result['description'] = gettext('Tayga');
+    $result['services'] = ['tayga'];
     return array($result);
 }
 

diff --git a/security/openconnect/Makefile b/security/openconnect/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		openconnect
 PLUGIN_VERSION=		1.4.0
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		OpenConnect Client
 PLUGIN_DEPENDS=		openconnect
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/security/openconnect/src/etc/inc/plugins.inc.d/openconnect.inc b/security/openconnect/src/etc/inc/plugins.inc.d/openconnect.inc
@@ -79,5 +79,6 @@ function openconnect_xmlrpc_sync()
     $result['id'] = 'openconnectvpn';
     $result['section'] = 'OPNsense.openconnect';
     $result['description'] = gettext('OpenConnect');
+    $result['services'] = ['openconnect'];
     return array($result);
 }
diff --git a/security/tinc/Makefile b/security/tinc/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		tinc
 PLUGIN_VERSION=		1.6
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		Tinc VPN
 PLUGIN_DEPENDS=		tinc
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc b/security/tinc/src/etc/inc/plugins.inc.d/tinc.inc
@@ -104,5 +104,6 @@ function tinc_xmlrpc_sync()
     $result['id'] = 'tincvpn';
     $result['section'] = 'OPNsense.Tinc';
     $result['description'] = gettext('Tinc VPN');
+    $result['services'] = ['tincd'];
     return array($result);
 }
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		nginx
 PLUGIN_VERSION=		1.21
-PLUGIN_REVISION=	2
+PLUGIN_REVISION=	3
 PLUGIN_COMMENT=		Nginx HTTP server and reverse proxy
 PLUGIN_DEPENDS=		nginx
 PLUGIN_MAINTAINER=	[email protected]

diff --git a/www/nginx/src/etc/inc/plugins.inc.d/nginx.inc b/www/nginx/src/etc/inc/plugins.inc.d/nginx.inc
@@ -61,5 +61,6 @@ function nginx_xmlrpc_sync()
     $result['id'] = 'nginx';
     $result['section'] = 'OPNsense.Nginx';
     $result['description'] = gettext('Nginx Load Balancer');
+    $result['services'] = ['nginx'];
     return array($result);
 }