valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #39676 from F30/hash-comment

Browse Source 
Fix comments about the "hash_type" option
This commit is contained in:
Mike Place 2017-02-27 13:11:40 -07:00 committed by GitHub
commit cbd66a0d3f
3 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf/master
View File

@ -549,11 +549,11 @@
#default_top: base #default_top: base
# The hash_type is the hash to use when discovering the hash of a file on # The hash_type is the hash to use when discovering the hash of a file on
# the master server. The default is md5 but sha1, sha224, sha256, sha384 # the master server. The default is sha256, but md5, sha1, sha224, sha384 and
# and sha512 are also supported. # sha512 are also supported.
# #
# WARNING: While md5 is also supported, do not use it due to the high chance # WARNING: While md5 and sha1 are also supported, do not use them due to the
# of possible collisions and thus security breach. # high chance of possible collisions and thus security breach.
# #
# Prior to changing this value, the master should be stopped and all Salt # Prior to changing this value, the master should be stopped and all Salt
# caches should be cleared. # caches should be cleared.

9
conf/minion
View File

@ -574,14 +574,11 @@
#fileserver_limit_traversal: False #fileserver_limit_traversal: False
# The hash_type is the hash to use when discovering the hash of a file on # The hash_type is the hash to use when discovering the hash of a file on
# the local fileserver. The default is md5, but sha1, sha224, sha256, sha384 # the local fileserver. The default is sha256, but md5, sha1, sha224, sha384
# and sha512 are also supported. # and sha512 are also supported.
# #
# WARNING: While md5 and sha1 are also supported, do not use it due to the high chance # WARNING: While md5 and sha1 are also supported, do not use them due to the
# of possible collisions and thus security breach. # high chance of possible collisions and thus security breach.
#
# WARNING: While md5 is also supported, do not use it due to the high chance
# of possible collisions and thus security breach.
# #
# Warning: Prior to changing this value, the minion should be stopped and all # Warning: Prior to changing this value, the minion should be stopped and all
# Salt caches should be cleared. # Salt caches should be cleared.

29
doc/man/salt.7
View File

@ -6093,17 +6093,17 @@ fileserver_list_cache_time: 5
.UNINDENT .UNINDENT
.SS \fBhash_type\fP .SS \fBhash_type\fP
.sp .sp
Default: \fBmd5\fP Default: \fBsha256\fP
.sp .sp
The hash_type is the hash to use when discovering the hash of a file on The hash_type is the hash to use when discovering the hash of a file on
the master server. The default is md5, but sha1, sha224, sha256, sha384, and the master server. The default is sha256, but md5, sha1, sha224, sha384, and
sha512 are also supported. sha512 are also supported.
.INDENT 0.0 .INDENT 0.0
.INDENT 3.5 .INDENT 3.5
.sp .sp
.nf .nf
.ft C .ft C
hash_type: md5 hash_type: sha256
.ft P .ft P
.fi .fi
.UNINDENT .UNINDENT
@ -10539,17 +10539,17 @@ fileserver_limit_traversal: False
.UNINDENT .UNINDENT
.SS \fBhash_type\fP .SS \fBhash_type\fP
.sp .sp
Default: \fBmd5\fP Default: \fBsha256\fP
.sp .sp
The hash_type is the hash to use when discovering the hash of a file on the The hash_type is the hash to use when discovering the hash of a file on the
local fileserver. The default is md5, but sha1, sha224, sha256, sha384, and local fileserver. The default is sha256, but md5, sha1, sha224, sha384, and
sha512 are also supported. sha512 are also supported.
.INDENT 0.0 .INDENT 0.0
.INDENT 3.5 .INDENT 3.5
.sp .sp
.nf .nf
.ft C .ft C
hash_type: md5 hash_type: sha256
.ft P .ft P
.fi .fi
.UNINDENT .UNINDENT
@ -11776,11 +11776,11 @@ event that an error is introduced in the latest revision of the repo.
#default_top: base #default_top: base
# The hash_type is the hash to use when discovering the hash of a file on # The hash_type is the hash to use when discovering the hash of a file on
# the master server. The default is md5 but sha1, sha224, sha256, sha384 # the master server. The default is sha256, but md5, sha1, sha224, sha384 and
# and sha512 are also supported. # sha512 are also supported.
# #
# WARNING: While md5 is also supported, do not use it due to the high chance # WARNING: While md5 and sha1 are also supported, do not use them due to the
# of possible collisions and thus security breach. # high chance of possible collisions and thus security breach.
# #
# Prior to changing this value, the master should be stopped and all Salt # Prior to changing this value, the master should be stopped and all Salt
# caches should be cleared. # caches should be cleared.
@ -12867,14 +12867,11 @@ event that an error is introduced in the latest revision of the repo.
#fileserver_limit_traversal: False #fileserver_limit_traversal: False
# The hash_type is the hash to use when discovering the hash of a file on # The hash_type is the hash to use when discovering the hash of a file on
# the local fileserver. The default is md5, but sha1, sha224, sha256, sha384 # the local fileserver. The default is sha256, but md5, sha1, sha224, sha384
# and sha512 are also supported. # and sha512 are also supported.
# #
# WARNING: While md5 and sha1 are also supported, do not use it due to the high chance # WARNING: While md5 and sha1 are also supported, do not use them due to the
# of possible collisions and thus security breach. # high chance of possible collisions and thus security breach.
#
# WARNING: While md5 is also supported, do not use it due to the high chance
# of possible collisions and thus security breach.
# #
# Warning: Prior to changing this value, the minion should be stopped and all # Warning: Prior to changing this value, the minion should be stopped and all
# Salt caches should be cleared. # Salt caches should be cleared.