Add SMF manifest, contributed by Jasper Siepkes in joyent/pkgsrc#279.

Bump PKGREVISION.

2 files changed, 62 insertions, 1 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 0daf285504e..3a7dc87d440 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2015/02/23 13:58:13 imil Exp $
+# $NetBSD: Makefile,v 1.27 2015/07/24 10:24:27 jperkin Exp $
 
 DISTNAME=	salt-2014.7.2
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://pypi.python.org/packages/source/s/salt/
 
@@ -36,6 +37,7 @@ PYSETUPINSTALLARGS+=	--salt-pidfile-dir=${VARBASE}/run
 REPLACE_PYTHON=	*.py */*.py */*/*.py
 
 RCD_SCRIPTS+=		salt_master salt_minion
+SMF_INSTANCES=		master minion
 FILES_SUBST+=		PYTHON=${PYTHONBIN:Q}
 
 PKG_SYSCONFSUBDIR=	salt
diff --git a/sysutils/salt/files/smf/manifest.xml b/sysutils/salt/files/smf/manifest.xml
new file mode 100644
index 00000000000..62c46e9cf05
--- /dev/null
+++ b/sysutils/salt/files/smf/manifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="@SMF_NAME@">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <dependency name='network' grouping='require_all' restart_on='error' type='service'>
+      <service_fmri value='svc:/milestone/network:default' />
+    </dependency>
+    <dependency name='filesystem-local' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local:default' />
+    </dependency>
+    <method_context>
+      <method_credential user='root' group='root' />
+      <method_environment>
+        <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
+      </method_environment>
+    </method_context>
+    <instance name='master' enabled='false'>
+      <exec_method type="method" name="start" exec="@PREFIX@/bin/salt-master -d" timeout_seconds="60" />
+      <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+      <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
+      <property_group name="startd" type="framework">
+        <propval name="duration" type="astring" value="contract" />
+        <propval name="ignore_error" type="astring" value="core,signal" />
+      </property_group>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/salt/master" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>Salt Master daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='salt-master' section='1' manpath='man'/>
+        </documentation>
+      </template>
+    </instance>
+    <instance name='minion' enabled='false'>
+      <exec_method type="method" name="start" exec="@PREFIX@/bin/salt-minion -d" timeout_seconds="60" />
+      <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+      <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
+      <property_group name="startd" type="framework">
+        <propval name="duration" type="astring" value="contract" />
+        <propval name="ignore_error" type="astring" value="core,signal" />
+      </property_group>
+      <property_group name="application" type="application">
+        <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/salt/minion" />
+      </property_group>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>Salt Minion daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='salt-minion' section='1' manpath='man'/>
+        </documentation>
+      </template>
+    </instance>
+    <stability value="Unstable" />
+  </service>
+</service_bundle>