Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
salt-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
salt-formula
Commits
7ddc1692
Commit
7ddc1692
authored
10 years ago
by
Niels Abspoel
Browse files
Options
Downloads
Patches
Plain Diff
added rest_tornado to _defaults.conf
see pillar.example for configuration
parent
f39fff23
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pillar.example
+8
-0
8 additions, 0 deletions
pillar.example
salt/files/master.d/_defaults.conf
+9
-0
9 additions, 0 deletions
salt/files/master.d/_defaults.conf
with
17 additions
and
0 deletions
pillar.example
+
8
−
0
View file @
7ddc1692
...
@@ -20,6 +20,14 @@ salt:
...
@@ -20,6 +20,14 @@ salt:
base:
base:
- /srv/salt
- /srv/salt
# for salt-api with tornado rest interface
rest_tornado:
port: 8000
ssl_crt: /etc/pki/api/certs/server.crt
ssl_key: /etc/pki/api/certs/server.key
debug: False
disable_ssl: False
# salt minion config:
# salt minion config:
minion:
minion:
master: salt
master: salt
...
...
This diff is collapsed.
Click to expand it.
salt/files/master.d/_defaults.conf
+
9
−
0
View file @
7ddc1692
...
@@ -947,6 +947,15 @@ rest_cherrypy:
...
@@ -947,6 +947,15 @@ rest_cherrypy:
{%-
endfor
%}
{%-
endfor
%}
{%-
endif
%}
{%-
endif
%}
{%
if
'rest_tornado'
in
cfg_master
%}
##### rest_tornado #####
###########################################
rest_tornado
:
{%
for
name
,
value
in
cfg_master
[
'rest_tornado'
].
items
() %}
{{
name
}}: {{
value
}}
{%-
endfor
%}
{%-
endif
%}
{%
if
'presence_events'
in
cfg_master
%}
{%
if
'presence_events'
in
cfg_master
%}
##### presence events #####
##### presence events #####
##########################################
##########################################
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment