diff options
| author | jperkin <jperkin> | 2017-05-05 15:24:59 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-05-05 15:24:59 +0000 |
| commit | 8d36ee95f6029b9dc7ed77252774f558136010e1 (patch) | |
| tree | 4dbe405d72524691c6c938967f08e00f1eb3f146 /sysutils/salt | |
| parent | 73d7ef7fa8bd3b21d677ac273678106d106bbeba (diff) | |
| download | pkgsrc-8d36ee95f6029b9dc7ed77252774f558136010e1.tar.gz | |
Add api SMF instance. From Jorge Schrauwen in joyent/pkgsrc#490.
Diffstat (limited to 'sysutils/salt')
| -rw-r--r-- | sysutils/salt/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/salt/files/smf/manifest.xml | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index c1aec805b7f..01448becad5 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -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 diff --git a/sysutils/salt/files/smf/manifest.xml b/sysutils/salt/files/smf/manifest.xml index 6d68597451c..cd95a626e08 100644 --- a/sysutils/salt/files/smf/manifest.xml +++ b/sysutils/salt/files/smf/manifest.xml @@ -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" /> |