pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/salt Add api SMF instance. From Jorge Schrau...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/348a4453e356
branches:  trunk
changeset: 362122:348a4453e356
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri May 05 15:24:59 2017 +0000

description:
Add api SMF instance.  From Jorge Schrauwen in joyent/pkgsrc#490.

diffstat:

 sysutils/salt/Makefile               |   4 ++--
 sysutils/salt/files/smf/manifest.xml |  20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r b95416e5eab7 -r 348a4453e356 sysutils/salt/Makefile
--- a/sysutils/salt/Makefile    Fri May 05 11:04:31 2017 +0000
+++ b/sysutils/salt/Makefile    Fri May 05 15:24:59 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2017/05/03 08:24:57 sborrill Exp $
+# $NetBSD: Makefile,v 1.50 2017/05/05 15:24:59 jperkin Exp $
 
 DISTNAME=      salt-2016.11.4
 CATEGORIES=    sysutils
@@ -37,7 +37,7 @@
 REPLACE_SH=            salt/templates/git/ssh-id-wrapper
 
 RCD_SCRIPTS+=          salt_master salt_minion salt_syndic
-SMF_INSTANCES=         master minion
+SMF_INSTANCES=         api master minion
 FILES_SUBST+=          PYTHON=${PYTHONBIN:Q}
 
 PKG_SYSCONFSUBDIR=     salt
diff -r b95416e5eab7 -r 348a4453e356 sysutils/salt/files/smf/manifest.xml
--- a/sysutils/salt/files/smf/manifest.xml      Fri May 05 11:04:31 2017 +0000
+++ b/sysutils/salt/files/smf/manifest.xml      Fri May 05 15:24:59 2017 +0000
@@ -15,6 +15,26 @@
         <envvar name="PATH" value="@PREFIX@/sbin:@PREFIX@/bin:/sbin:/usr/sbin:/usr/bin" />
       </method_environment>
     </method_context>
+    <instance name='api' enabled='false'>
+      <exec_method type="method" name="start" exec="@PREFIX@/bin/salt-api -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 NetAPI daemon</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='salt-api' section='1' manpath='@PREFIX@/@PKGMANDIR@'/>
+        </documentation>
+      </template>
+    </instance>
     <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" />



Home | Main Index | Thread Index | Old Index