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.

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

Minor doc fixes for PostgreSQL states #34569

Merged
merged 3 commits into from
Jul 11, 2016
Merged
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions salt/states/postgres_group.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def present(name,
'''
Ensure that the named group is present with the specified privileges
Please note that the user/group notion in postgresql is just abstract, we
have roles, where users can be seens as roles with the LOGIN privilege
have roles, where users can be seen as roles with the ``LOGIN`` privilege
and groups the others.

name
Expand Down Expand Up @@ -84,14 +84,13 @@ def present(name,
Should the new group be allowed to initiate streaming replication

password
The Group's password
The group's password
It can be either a plain string or a md5 postgresql hashed password::

'md5{MD5OF({password}{role}}'

If encrypted is None or True, the password will be automatically
encrypted to the previous
format if it is not already done.
If encrypted is ``None`` or ``True``, the password will be automatically
encrypted to the previous format if it is not already done.

refresh_password
Password refresh flag
Expand All @@ -114,7 +113,7 @@ def present(name,
.. versionadded:: 0.17.0

db_user
database username if different from config or defaul
database username if different from config or default

db_password
user password if any password for a specified user
Expand Down