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

Jump to bottom

More YAML indentation fixes in state module examples #34030

Merged
merged 2 commits into from
Jun 15, 2016
Merged

More YAML indentation fixes in state module examples #34030

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
b7f70fb
states.file: fix indentation in YAML examples
vutny Jun 14, 2016
4607fe9
More YAML indentation fixes
vutny Jun 15, 2016
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
8 changes: 4 additions & 4 deletions salt/states/apache_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
.. code-block:: yaml

Enable cgi module:
apache_module.enable:
- name: cgi
apache_module.enable:
- name: cgi

Disable cgi module:
apache_module.disable:
- name: cgi
apache_module.disable:
- name: cgi
'''
from __future__ import absolute_import
from salt.ext.six import string_types
Expand Down
42 changes: 21 additions & 21 deletions salt/states/file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,31 +1810,31 @@ def directory(name,
.. code-block:: yaml

/var/log/httpd:
file.directory:
file.directory:
- user: root
- group: root
- dir_mode: 755
- file_mode: 644
- recurse:
- user
- group
- mode
- user
- group
- mode

Leave files or directories unchanged:

.. code-block:: yaml

/var/log/httpd:
file.directory:
file.directory:
- user: root
- group: root
- dir_mode: 755
- file_mode: 644
- recurse:
- user
- group
- mode
- ignore_dirs
- user
- group
- mode
- ignore_dirs

.. versionadded:: 2015.5.0

Expand Down Expand Up @@ -3451,9 +3451,9 @@ def append(name,
- append
- template: jinja
- sources:
- salt://motd/devops-messages.tmpl
- salt://motd/hr-messages.tmpl
- salt://motd/general-messages.tmpl
- salt://motd/devops-messages.tmpl
- salt://motd/hr-messages.tmpl
- salt://motd/general-messages.tmpl

.. versionadded:: 0.9.5
'''
Expand Down Expand Up @@ -3626,9 +3626,9 @@ def prepend(name,
- prepend
- template: jinja
- sources:
- salt://motd/devops-messages.tmpl
- salt://motd/hr-messages.tmpl
- salt://motd/general-messages.tmpl
- salt://motd/devops-messages.tmpl
- salt://motd/hr-messages.tmpl
- salt://motd/general-messages.tmpl

.. versionadded:: 2014.7.0
'''
Expand Down Expand Up @@ -4657,12 +4657,12 @@ def mknod(name, ntype, major=0, minor=0, user=None, group=None, mode='0600'):
- group: root
- mode: 660

/dev/fifo:
file.mknod:
- ntype: p
- user: root
- group: root
- mode: 660
/dev/fifo:
file.mknod:
- ntype: p
- user: root
- group: root
- mode: 660

.. versionadded:: 0.17.0
'''
Expand Down