Skip to content

Commit

Permalink
Merge branch 'states_example_indentation' into 'master'
Browse files Browse the repository at this point in the history
fix indentation in examples

See merge request saltstack/open/docs/salt-user-guide!97
  • Loading branch information
barbaricyawps committed Feb 5, 2024
2 parents cf04036 + bdec135 commit 5edf38b
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 32 deletions.
1 change: 1 addition & 0 deletions .brokignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ https://saltstack.gitlab.io/open/docs/salt-user-guide
https://twitter.com/intent/follow?screen_name=Salt_Project_OS
https://www.example.com
https://www.example.org
https://www.reddit.com/r/saltstack/
https://your-GitLab-username.gitlab.io
14 changes: 7 additions & 7 deletions docs/topics/requisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ to do this, set ``order: last``
update_status:
module.function:
- name: http.query
- args:
- 'https://example.org/update-status'
- kwargs:
- method: POST
- params: 'keyA=valA&keyB=valB'
- order: last
- name: http.query
- args:
- 'https://example.org/update-status'
- kwargs:
- method: POST
- params: 'keyA=valA&keyB=valB'
- order: last
install_app:
pkg.installed:
Expand Down
18 changes: 9 additions & 9 deletions docs/topics/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -312,15 +312,15 @@ Salt’s External Authentication System (eAuth) allows for Salt to pass through
# examples of external authentication definitions
external_auth:
auth_module: # the authentication system
some_user_or_group%: # a user or group given access
'some_host': # a minion matching expressing
- exec_mod.function # access a specific function
- exec_mod.* # access to all module functions
- exec_mod.* # all access a specific function
- '@wheel' # access to all wheel modules
- '@runner' # access to all runner modules
- '@jobs' # access to the jobs runner and/or wheel module
auth_module: # the authentication system
some_user_or_group%: # a user or group given access
'some_host': # a minion matching expressing
- exec_mod.function # access a specific function
- exec_mod.* # access to all module functions
- exec_mod.* # all access a specific function
- '@wheel' # access to all wheel modules
- '@runner' # access to all runner modules
- '@jobs' # access to the jobs runner and/or wheel module
LDAP external authentication
Expand Down
32 changes: 16 additions & 16 deletions docs/topics/states.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ However, doing the same with a Salt state requires no check state, since the ins
install_tree_now:
pkg.installed:
- pkgs:
- tree
- tree
.. code-block:: bash
Expand Down Expand Up @@ -240,21 +240,21 @@ The contents and layout of the files are intended to be as simple as possible, w
:caption: /srv/salt/top.sls
base:
'*':
- core
'^(app|web).(qa|prod).loc$':
- match: pcre
- httpd
- nagios.web
'os:Ubuntu':
- match: grain
- repos.ubuntu
'os_family:RedHat':
- match: grain
- repos.epel
'nagios* or G@role:monitoring':
- match: compound
- nagios.server
'*':
- core
'^(app|web).(qa|prod).loc$':
- match: pcre
- httpd
- nagios.web
'os:Ubuntu':
- match: grain
- repos.ubuntu
'os_family:RedHat':
- match: grain
- repos.epel
'nagios* or G@role:monitoring':
- match: compound
- nagios.server
* ``base`` is the default environment to use as the ``file_roots``.
* Targeting parameter is defined next.
Expand Down

0 comments on commit 5edf38b

Please sign in to comment.