Skip to content

Commit

Permalink
Merge pull request #34569 from eliasp/2016.3-postgres-doc
Browse files Browse the repository at this point in the history
Minor doc fixes for PostgreSQL states
  • Loading branch information
Mike Place committed Jul 11, 2016
2 parents 7e1abd7 + 221da29 commit 5b002e1
Showing 1 changed file with 5 additions and 6 deletions.
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

0 comments on commit 5b002e1

Please sign in to comment.