Skip to content

Commit

Permalink
Merge pull request #229 from mchugh19/master
Browse files Browse the repository at this point in the history
Support engine configuration
  • Loading branch information
gravyboat committed May 28, 2016
2 parents 76de5f9 + ac4ed62 commit 7f41dff
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
16 changes: 16 additions & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@ salt:
# filter to use for Most other LDAP servers
auth.ldap.filter: {% raw %}'uid={{ username }}'{% endraw %}

# optional engine configuration
engines:
slack:
token: xoxp-XXXXX-XXXXXXX
control: True
valid_users:
- someuser
- otheruser
valid_commands:
- test.ping
- list_jobs
aliases:
list_jobs:
type: runner
cmd: jobs.list_jobs

# salt minion config:
minion:

Expand Down
8 changes: 8 additions & 0 deletions salt/files/master.d/engine.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set engines = salt['pillar.get']('salt:engines') -%}
{%- if engines %}
engines:
{{ engines | yaml(False) | indent(2) }}
{%- endif -%}

0 comments on commit 7f41dff

Please sign in to comment.