pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/salt
Module Name: pkgsrc
Committed By: jperkin
Date: Fri May 5 15:24:59 UTC 2017
Modified Files:
pkgsrc/sysutils/salt: Makefile
pkgsrc/sysutils/salt/files/smf: manifest.xml
Log Message:
Add api SMF instance. From Jorge Schrauwen in joyent/pkgsrc#490.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/salt/files/smf/manifest.xml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.49 pkgsrc/sysutils/salt/Makefile:1.50
--- pkgsrc/sysutils/salt/Makefile:1.49 Wed May 3 08:24:57 2017
+++ pkgsrc/sysutils/salt/Makefile Fri May 5 15:24:59 2017
@@ -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_PYTHON= *.py */*.py */*/*.py
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
Index: pkgsrc/sysutils/salt/files/smf/manifest.xml
diff -u pkgsrc/sysutils/salt/files/smf/manifest.xml:1.5 pkgsrc/sysutils/salt/files/smf/manifest.xml:1.6
--- pkgsrc/sysutils/salt/files/smf/manifest.xml:1.5 Wed Jun 8 10:16:56 2016
+++ pkgsrc/sysutils/salt/files/smf/manifest.xml Fri May 5 15:24:59 2017
@@ -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