Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added SMF support to 'sysutils/salt'. #279

Closed
wants to merge 2 commits into from
Closed

Added SMF support to 'sysutils/salt'. #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e14cfee
Added SMF support to 'sysutils/salt'.
siepkes Jul 23, 2015
92ece36
Added SMF instance names to pkgsrc Makefile.
siepkes Jul 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sysutils/salt/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,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
Expand Down
63 changes: 63 additions & 0 deletions sysutils/salt/files/smf/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?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>