Browse Source

Merge pull request #229 from mchugh19/master

Support engine configuration
master
Forrest 8 years ago
parent
commit
7f41dff871
2 changed files with 24 additions and 0 deletions
  1. +16
    -0
      pillar.example
  2. +8
    -0
      salt/files/master.d/engine.conf

+ 16
- 0
pillar.example View File

@@ -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:


+ 8
- 0
salt/files/master.d/engine.conf View File

@@ -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 -%}

Loading…
Cancel
Save