[pkgsrc/trunk]: pkgsrc/net/net-snmp net-snmp: Add SMF instance for snmptrapd

[otis <otis%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3f261e5da45
branches:  trunk
changeset: 441471:d3f261e5da45
user:      otis <otis%pkgsrc.org@localhost>
date:      Wed Nov 04 15:51:31 2020 +0000

description:
net-snmp: Add SMF instance for snmptrapd

diffstat:

 net/net-snmp/Makefile               |   3 +-
 net/net-snmp/files/smf/manifest.xml |  54 ++++++++++++++++++++++++------------
 2 files changed, 38 insertions(+), 19 deletions(-)

diffs (87 lines):

diff -r 26adce223b92 -r d3f261e5da45 net/net-snmp/Makefile
--- a/net/net-snmp/Makefile     Wed Nov 04 15:17:56 2020 +0000
+++ b/net/net-snmp/Makefile     Wed Nov 04 15:51:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2020/08/31 18:10:37 wiz Exp $
+# $NetBSD: Makefile,v 1.133 2020/11/04 15:51:31 otis Exp $
 
 PKGREVISION= 1
 .include "Makefile.common"
@@ -106,6 +106,7 @@
 REQD_DIRS=     ${PREFIX}/share/snmp
 RCD_SCRIPTS=   snmpd snmptrapd
 SMF_NAME=      snmp
+SMF_INSTANCES= default snmptrapd
 
 USE_TOOLS+=            sh:run
 REPLACE_INTERPRETER+=  bash
diff -r 26adce223b92 -r d3f261e5da45 net/net-snmp/files/smf/manifest.xml
--- a/net/net-snmp/files/smf/manifest.xml       Wed Nov 04 15:17:56 2020 +0000
+++ b/net/net-snmp/files/smf/manifest.xml       Wed Nov 04 15:51:31 2020 +0000
@@ -2,8 +2,6 @@
 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <service_bundle type='manifest' name='export'>
   <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
-    <create_default_instance enabled='false'/>
-    <single_instance/>
     <dependency name='milestone' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/milestone/sysconfig'/>
     </dependency>
@@ -25,21 +23,41 @@
     <dependency name='network' grouping='require_all' restart_on='restart' type='service'>
       <service_fmri value='svc:/milestone/network'/>
     </dependency>
-    <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-      <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmpd.conf'/>
-    </dependency>
-    <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file}' timeout_seconds='60'/>
-    <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
-    <property_group name="application" type="application">
-      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmpd.conf" />
-    </property_group>
-    <template>
-      <common_name>
-        <loctext xml:lang='C'>net-snmp SNMP daemon</loctext>
-      </common_name>
-      <documentation>
-        <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
-      </documentation>
-    </template>
+    <instance name='default' enabled='false'>
+      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+        <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmpd.conf'/>
+      </dependency>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmpd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmpd.conf" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>net-snmp SNMP daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
+        </documentation>
+      </template>
+    </instance>
+    <instance name='snmptrapd' enabled='false'>
+      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+        <service_fmri value='file://localhost/@PKG_SYSCONFDIR@/snmptrapd.conf'/>
+      </dependency>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/snmptrapd -c %{config_file}' timeout_seconds='60'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='60'/>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/snmptrapd.conf" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>net-snmp SNMP trapper daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='snmpd' section='1M' manpath='@PREFIX@/@PKGMANDIR@/'/>
+        </documentation>
+      </template>
+    </instance>
   </service>
 </service_bundle>