Merge pull request #10457 from basepi/configfix10433

Clarify the actions salt will take when run as non-root, Ref #10433
This commit is contained in:
Thomas S Hatch 2014-02-14 16:35:15 -07:00
commit da477a920b

View File

@ -20,9 +20,10 @@
# The tcp port used by the publisher
#publish_port: 4505
# The user to run the salt-master as. Salt will update all permissions to
# allow the specified user to run the master. If the modified files cause
# conflicts set verify_env to False.
# The user under which the salt master will run. Salt will update all
# permissions to allow the specified user to run the master. The exception is
# the job cache, which must be deleted if this user is changed. If the
# modified files cause conflicts set verify_env to False.
#user: root
# Max open files